Fix cutter build by enforcing exclude-libs,ALL

Author: wargio

c/jsdec-cutter.c

@@ -319,7 +319,7 @@ static RzAnnotatedCode *parse_json(RzStrBuf *sb) {
 	return code;
 }
 
-RzAnnotatedCode *jsdec_as_annotation(RzCore *core, ut64 addr) {
+RZ_API RzAnnotatedCode *jsdec_as_annotation(RzCore *core, ut64 addr) {
 	ExecContext ectx;
 	ectx.core = core;
 	ectx.anno = rz_strbuf_new("");

cutter-plugin/CMakeLists.txt

@@ -17,8 +17,10 @@ add_library(jsdec_cutter MODULE
 	JSDecDecompiler.cpp
 )
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--exclude-libs,ALL")
+
 find_library(libjsdec NAMES jsdec PATHS "${JSDEC_BUILD_DIR}")
-include_directories("../c")
+include_directories("../include")
 
 find_package(Cutter REQUIRED)
 

cutter-plugin/JSDecDecompiler.cpp

@@ -8,7 +8,7 @@
 #include <QJsonObject>
 #include <QJsonArray>
 
-#include "../c/jsdec-cutter.h"
+#include "jsdec-cutter.h"
 
 JSDecDecompiler::JSDecDecompiler(QObject *parent)
     : Decompiler("jsdec", "jsdec", parent) {

c/jsdec-cutter.h include/jsdec-cutter.h

@@ -10,7 +10,7 @@ extern "C" {
 
 #include <rz_util/rz_annotated_code.h>
 
-RzAnnotatedCode *jsdec_as_annotation(RzCore *core, ut64 addr);
+RZ_API RzAnnotatedCode *jsdec_as_annotation(RzCore *core, ut64 addr);
 
 #ifdef __cplusplus
 }

meson.build

@@ -11,7 +11,7 @@ project('jsdec', 'c', meson_version: '>=0.56.0',
 
 cc = meson.get_compiler('c')
 
-jsdec_incs = ['.', 'c']
+jsdec_incs = ['.', 'c', 'include']
 jsdec_c_args = []
 jsdec_src = [
     'c' / 'jsdec.c',
@@ -67,6 +67,7 @@ if build_type == 'standalone'
     install: false,
   )
 elif build_type == 'cutter'
+  jsdec_deps = [ libquickjs_dep.as_link_whole() ]
   jsdec_deps += dependency('rz_core')
   jsdec_deps += dependency('rz_util')
   jsdec_deps += dependency('rz_cons')
@@ -79,6 +80,13 @@ elif build_type == 'cutter'
     'c' / 'jsdec-cutter.c'
   ]
 
+  if cc.has_argument('-fvisibility=hidden')
+    jsdec_c_args += '-fvisibility=hidden'
+  endif
+  if cc.has_argument('-flto')
+    jsdec_c_args += '-flto'
+  endif
+
   libjsdec = static_library('jsdec', jsdec_src,
     c_args : jsdec_c_args,
     dependencies: jsdec_deps,
@@ -90,7 +98,7 @@ elif build_type == 'cutter'
   )
   libjsdec_dep = declare_dependency(
     link_with: libjsdec,
-    include_directories: include_directories(jsdec_incs),
+    include_directories: include_directories(['include']),
   )
 elif build_type == 'rizin'
   # build plugin for Rizin