From 493cdfabc9ca884910dc3850f0915a0266580a06 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 24 Jul 2023 10:31:26 +0200 Subject: [PATCH] Fix exported symbols Signed-off-by: falkTX --- source/plugin/Makefile | 19 ++++++++++++++++++- source/plugin/carla-host-plugin.cpp | 1 + source/plugin/carla-native-plugin.cpp | 2 +- source/plugin/symbols/carla-native-plugin.def | 3 +++ source/plugin/symbols/carla-native-plugin.txt | 3 +++ .../symbols/carla-native-plugin.version | 3 +++ 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/source/plugin/Makefile b/source/plugin/Makefile index 24a4d4c28b..19d9f973ab 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -134,9 +134,17 @@ SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay16_plugin SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay32_plugin SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay64_plugin SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_cv_plugin +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_cv8_plugin +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_cv32_plugin +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_obs_plugin SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_create_native_plugin_host_handle SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_host_handle_free SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_plugin_engine +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_complete_license_text +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_juce_version +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_supported_file_extensions +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_supported_features +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_library_filename SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_library_folder SYMBOLS_LV2 = -Wl,-exported_symbol,_lv2_descriptor ifeq ($(HAVE_PYQT),true) @@ -152,9 +160,18 @@ SYMBOLS_NATIVE += 'carla_get_native_patchbay16_plugin', SYMBOLS_NATIVE += 'carla_get_native_patchbay32_plugin', SYMBOLS_NATIVE += 'carla_get_native_patchbay64_plugin', SYMBOLS_NATIVE += 'carla_get_native_patchbay_cv_plugin', +SYMBOLS_NATIVE += 'carla_get_native_patchbay_cv8_plugin', +SYMBOLS_NATIVE += 'carla_get_native_patchbay_cv32_plugin', +SYMBOLS_NATIVE += 'carla_get_native_patchbay_obs_plugin', SYMBOLS_NATIVE += 'carla_create_native_plugin_host_handle', SYMBOLS_NATIVE += 'carla_host_handle_free', -SYMBOLS_NATIVE += 'carla_get_native_plugin_engine' +SYMBOLS_NATIVE += 'carla_get_native_plugin_engine', +SYMBOLS_NATIVE += 'carla_get_complete_license_text', +SYMBOLS_NATIVE += 'carla_get_juce_version', +SYMBOLS_NATIVE += 'carla_get_supported_file_extensions', +SYMBOLS_NATIVE += 'carla_get_supported_features', +SYMBOLS_NATIVE += 'carla_get_library_filename', +SYMBOLS_NATIVE += 'carla_get_library_folder' SYMBOLS_NATIVE += ]" ifeq ($(HAVE_PYQT),true) SYMBOLS_LV2 = -sSIDE_MODULE=2 -sEXPORTED_FUNCTIONS="['lv2_descriptor','lv2ui_descriptor']" diff --git a/source/plugin/carla-host-plugin.cpp b/source/plugin/carla-host-plugin.cpp index 5bc748582a..247efbf34d 100644 --- a/source/plugin/carla-host-plugin.cpp +++ b/source/plugin/carla-host-plugin.cpp @@ -18,6 +18,7 @@ #include "CarlaNativePlugin.h" #define CARLA_PLUGIN_BUILD +#define CARLA_HOST_PLUGIN_BUILD #include "carla-native-plugin.cpp" diff --git a/source/plugin/carla-native-plugin.cpp b/source/plugin/carla-native-plugin.cpp index 0ea582d222..ce97b45a49 100644 --- a/source/plugin/carla-native-plugin.cpp +++ b/source/plugin/carla-native-plugin.cpp @@ -26,7 +26,7 @@ // -------------------------------------------------------------------------------------------------------------------- // Expose info functions as needed -#ifndef CARLA_PLUGIN_BUILD +#ifndef CARLA_HOST_PLUGIN_BUILD # include "utils/Information.cpp" #endif diff --git a/source/plugin/symbols/carla-native-plugin.def b/source/plugin/symbols/carla-native-plugin.def index 0e5445452f..e222e9c2a9 100644 --- a/source/plugin/symbols/carla-native-plugin.def +++ b/source/plugin/symbols/carla-native-plugin.def @@ -16,3 +16,6 @@ EXPORTS carla_get_supported_features @13 carla_get_library_filename @14 carla_get_library_folder @15 + carla_get_native_patchbay_cv8_plugin @16 + carla_get_native_patchbay_cv32_plugin @17 + carla_get_native_patchbay_obs_plugin @18 diff --git a/source/plugin/symbols/carla-native-plugin.txt b/source/plugin/symbols/carla-native-plugin.txt index 896cfa6fc0..060bb55285 100644 --- a/source/plugin/symbols/carla-native-plugin.txt +++ b/source/plugin/symbols/carla-native-plugin.txt @@ -4,6 +4,9 @@ carla_get_native_patchbay16_plugin carla_get_native_patchbay32_plugin carla_get_native_patchbay64_plugin carla_get_native_patchbay_cv_plugin +carla_get_native_patchbay_cv8_plugin +carla_get_native_patchbay_cv32_plugin +carla_get_native_patchbay_obs_plugin carla_create_native_plugin_host_handle carla_host_handle_free carla_get_native_plugin_engine diff --git a/source/plugin/symbols/carla-native-plugin.version b/source/plugin/symbols/carla-native-plugin.version index f6285765b8..855b984100 100644 --- a/source/plugin/symbols/carla-native-plugin.version +++ b/source/plugin/symbols/carla-native-plugin.version @@ -5,6 +5,9 @@ carla_get_native_patchbay32_plugin; carla_get_native_patchbay64_plugin; carla_get_native_patchbay_cv_plugin; + carla_get_native_patchbay_cv8_plugin; + carla_get_native_patchbay_cv32_plugin; + carla_get_native_patchbay_obs_plugin; carla_create_native_plugin_host_handle; carla_host_handle_free; carla_get_native_plugin_engine;