diff --git a/.gitmodules b/.gitmodules index dd8cbf2834e..13b98c6529a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "plugins/OpulenZ/adplug"] path = plugins/OpulenZ/adplug url = https://github.com/adplug/adplug.git -[submodule "plugins/LadspaEffect/calf/veal"] - path = plugins/LadspaEffect/calf/veal - url = https://github.com/tresf/veal [submodule "plugins/Xpressive/exprtk"] path = plugins/Xpressive/exprtk url = https://github.com/ArashPartow/exprtk @@ -25,3 +22,6 @@ [submodule "src/3rdparty/weakjack/weakjack"] path = src/3rdparty/weakjack/weakjack url = https://github.com/x42/weakjack.git +[submodule "plugins/LadspaEffect/calf/veal"] + path = plugins/LadspaEffect/calf/veal + url = https://github.com/tresf/veal diff --git a/plugins/LadspaEffect/calf/CMakeLists.txt b/plugins/LadspaEffect/calf/CMakeLists.txt index 8e90b8da277..88361f735b1 100644 --- a/plugins/LadspaEffect/calf/CMakeLists.txt +++ b/plugins/LadspaEffect/calf/CMakeLists.txt @@ -29,6 +29,10 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include" INSTALL(TARGETS veal LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") SET_TARGET_PROPERTIES(veal PROPERTIES PREFIX "") + +# Disable OSC messaging, it's not mingw compatible +TARGET_COMPILE_DEFINITIONS(veal PRIVATE DISABLE_OSC=1) + SET(INLINE_FLAGS "") IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") SET(INLINE_FLAGS "-finline-functions-called-once -finline-limit=80") @@ -42,4 +46,3 @@ ENDIF() IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD) SET_TARGET_PROPERTIES(veal PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") ENDIF() - diff --git a/plugins/LadspaEffect/calf/veal b/plugins/LadspaEffect/calf/veal index b772ae260a4..c6e74543ee1 160000 --- a/plugins/LadspaEffect/calf/veal +++ b/plugins/LadspaEffect/calf/veal @@ -1 +1 @@ -Subproject commit b772ae260a4b89eb833feafb2a56aaa192ae46de +Subproject commit c6e74543ee1ae2d99132446d873066347d4ade5d