From effc7d910ecfe1a3b0105c75b97ce0cce85599d5 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 15 Apr 2023 18:01:11 +0200 Subject: [PATCH] Fix windows and macOS builds Signed-off-by: falkTX --- carla | 2 +- jucewrapper/CMakeLists.txt | 79 +++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/carla b/carla index 04d3e12..6f22f09 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 04d3e126b48aef0689e97816efb3b817319cc388 +Subproject commit 6f22f09d230236d2a8bbdd662d46146d81b318b1 diff --git a/jucewrapper/CMakeLists.txt b/jucewrapper/CMakeLists.txt index 3d344ba..5fec6cd 100644 --- a/jucewrapper/CMakeLists.txt +++ b/jucewrapper/CMakeLists.txt @@ -14,7 +14,40 @@ add_library(dgl STATIC IMPORTED) set_property(TARGET dgl PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../dpf/build/libdgl-opengl.a") add_library(carla_host_plugin STATIC IMPORTED) -set_property(TARGET carla_host_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/bin/libcarla_host-plugin.a") +set_property(TARGET carla_host_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/plugin/${CMAKE_BUILD_TYPE}/carla-host-plugin.cpp.o") + +add_library(carla_engine_plugin STATIC IMPORTED) +set_property(TARGET carla_engine_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/carla_engine_plugin.a") + +add_library(carla_plugin STATIC IMPORTED) +set_property(TARGET carla_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/carla_plugin.a") + +add_library(native_plugins STATIC IMPORTED) +set_property(TARGET native_plugins PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/native-plugins.a") + +add_library(audio_decoder STATIC IMPORTED) +set_property(TARGET audio_decoder PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/audio_decoder.a") + +add_library(jackbridge STATIC IMPORTED) +set_property(TARGET jackbridge PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/jackbridge.min.a") + +add_library(lilv STATIC IMPORTED) +set_property(TARGET lilv PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/lilv.a") + +add_library(rtmempool STATIC IMPORTED) +set_property(TARGET rtmempool PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/rtmempool.a") + +add_library(sfzero STATIC IMPORTED) +set_property(TARGET sfzero PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/sfzero.a") + +add_library(water STATIC IMPORTED) +set_property(TARGET water PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/water.a") + +add_library(ysfx STATIC IMPORTED) +set_property(TARGET ysfx PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/ysfx.a") + +add_library(zita_resampler STATIC IMPORTED) +set_property(TARGET zita_resampler PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/zita-resampler.a") add_library(sCardinal STATIC IMPORTED) set_property(TARGET sCardinal PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../bin/Cardinal.a") @@ -160,6 +193,17 @@ target_link_libraries(Cardinal sCardinal sRack carla_host_plugin + carla_engine_plugin + carla_plugin + native_plugins + audio_decoder + jackbridge + lilv + rtmempool + sfzero + water + ysfx + zita_resampler dgl surgedep01 surgedep02 @@ -252,6 +296,17 @@ target_link_libraries(CardinalFX sCardinalFX sRack carla_host_plugin + carla_engine_plugin + carla_plugin + native_plugins + audio_decoder + jackbridge + lilv + rtmempool + sfzero + water + ysfx + zita_resampler dgl surgedep01 surgedep02 @@ -343,6 +398,17 @@ target_link_libraries(CardinalMIDI sCardinalFX sRack carla_host_plugin + carla_engine_plugin + carla_plugin + native_plugins + audio_decoder + jackbridge + lilv + rtmempool + sfzero + water + ysfx + zita_resampler dgl surgedep01 surgedep02 @@ -434,6 +500,17 @@ target_link_libraries(CardinalSynth sCardinalSynth sRack carla_host_plugin + carla_engine_plugin + carla_plugin + native_plugins + audio_decoder + jackbridge + lilv + rtmempool + sfzero + water + ysfx + zita_resampler dgl surgedep01 surgedep02