Enable zyn plugins for non-linux; Update osx main build script

data/macos/build.sh

@@ -8,36 +8,38 @@ if [ ! -f Makefile ]; then
   cd ../..
 fi
 
+TARGETDIR=$HOME/builds
+
 export MACOS="true"
 export CC=clang
 export CXX=clang++
 export CXFREEZE="/opt/carla/bin/cxfreeze --include-modules=re,sip,subprocess,inspect"
 export DEFAULT_QT=5
-export PYUIC5=/opt/carla/bin/pyuic5
+export PYUIC5=$TARGETDIR/carla/bin/pyuic5
 
 unset CPPFLAGS
 
 ##############################################################################################
 # Complete 64bit build
 
-export CFLAGS=-m64
-export CXXFLAGS=-m64
-export LDLAGS=-m64
+export CFLAGS="-O3 -m64"
+export CXXFLAGS=$CFLAGS
+export LDFLAGS="-m64"
 
-export PATH=/opt/carla/bin:/opt/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-export PKG_CONFIG_PATH=/opt/carla/lib/pkgconfig:/opt/carla64/lib/pkgconfig
+export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
 
 make $JOBS
 
 ##############################################################################################
 # Build 32bit bridges
 
-export CFLAGS=-m32
-export CXXFLAGS=-m32
-export LDLAGS=-m32
+export CFLAGS="-O3 -m32"
+export CXXFLAGS=$CFLAGS
+export LDFLAGS="-m32"
 
-export PATH=/opt/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-export PKG_CONFIG_PATH=/opt/carla32/lib/pkgconfig
+export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig
 
 make posix32 $JOBS
 

source/native-plugins/Makefile

@@ -33,7 +33,7 @@ ifeq ($(HAVE_ZYN_DEPS),true)
 ZYN_CXX_FLAGS  = $(BUILD_CXX_FLAGS) -Izynaddsubfx -Izynaddsubfx/rtosc
 ZYN_CXX_FLAGS += $(shell pkg-config --cflags fftw3 mxml zlib)
 ZYN_LD_FLAGS   = $(shell pkg-config --libs liblo)
-ZYN_LD_FLAGS  += -ldl -lpthread -lrt
+ZYN_LD_FLAGS  += -ldl -lpthread
 ifeq ($(HAVE_X11),true)
 ZYN_CXX_FLAGS += $(shell pkg-config --cflags x11)
 ZYN_LD_FLAGS  += $(shell pkg-config --libs x11)
@@ -50,6 +50,9 @@ ZYN_CXX_FLAGS += -DFLTK_GUI
 ZYN_CXX_FLAGS += $(shell fltk-config --use-images --cxxflags)
 ZYN_LD_FLAGS  += $(shell fltk-config --use-images --ldflags)
 endif # HAVE_NTK
+ifneq ($(LINUX),true)
+ZYN_LD_FLAGS  += $(MODULEDIR)/juce_core.a
+endif
 else  # HAVE_ZYN_UI_DEPS
 ZYN_CXX_FLAGS += -DNO_UI
 endif # HAVE_ZYN_UI_DEPS
@@ -113,7 +116,6 @@ OBJS += \
 # ----------------------------------------------------------------------------------------------------------------------------
 # ZynAddSubFX
 
-ifeq ($(LINUX),true)
 ifeq ($(HAVE_ZYN_DEPS),true)
 OBJS += \
 	$(OBJDIR)/zynaddsubfx-fx.cpp.o \
@@ -160,7 +162,6 @@ ZYN_UI_FILES_H = \
 	zynaddsubfx/UI/VirKeyboard.h
 endif
 endif
-endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
 # Experimental plugins

source/native-plugins/_all.c

@@ -116,11 +116,9 @@ void carla_register_all_native_plugins(void)
 #endif
 
 #ifdef HAVE_ZYN_DEPS
-# ifdef CARLA_OS_LINUX
     // ZynAddSubFX
     carla_register_native_plugin_zynaddsubfx_fx();
     carla_register_native_plugin_zynaddsubfx_synth();
-# endif
 #endif
 
 #ifdef HAVE_EXPERIMENTAL_PLUGINS

source/native-plugins/_data.cpp

@@ -704,13 +704,12 @@ static const NativePluginDescriptor sNativePluginDescriptors[] = {
     /* copyright */ "GNU GPL v2+",
     DESCFUNCS
 },
-# ifdef CARLA_OS_LINUX
 {
     /* category  */ NATIVE_PLUGIN_CATEGORY_SYNTH,
     /* hints     */ static_cast<NativePluginHints>(NATIVE_PLUGIN_IS_SYNTH
-#  ifdef HAVE_ZYN_UI_DEPS
+# ifdef HAVE_ZYN_UI_DEPS
                                                   |NATIVE_PLUGIN_HAS_UI
-#  endif
+# endif
                                                   |NATIVE_PLUGIN_USES_MULTI_PROGS
                                                   |NATIVE_PLUGIN_USES_STATE),
     /* supports  */ static_cast<NativePluginSupports>(NATIVE_PLUGIN_SUPPORTS_CONTROL_CHANGES
@@ -729,7 +728,6 @@ static const NativePluginDescriptor sNativePluginDescriptors[] = {
     /* copyright */ "GNU GPL v2+",
     DESCFUNCS
 },
-# endif // CARLA_OS_LINUX
 #endif // HAVE_ZYN_DEPS
 
 

source/native-plugins/zynaddsubfx/Misc/MiddleWare.cpp

@@ -8,7 +8,6 @@
 #include <rtosc/undo-history.h>
 #include <rtosc/thread-link.h>
 #include <rtosc/ports.h>
-#include <rtosc/typed-message.h>
 #include <lo/lo.h>
 
 #include <unistd.h>
@@ -378,7 +377,6 @@ struct ParamStore
 namespace Nio
 {
     using std::get;
-    using rtosc::rtMsg;
     rtosc::Ports ports = {
         {"sink-list:", 0, 0, [](const char *, rtosc::RtData &d) {
                 auto list = Nio::getSinks();
@@ -395,13 +393,13 @@ namespace Nio
         {"source::s", 0, 0, [](const char *msg, rtosc::RtData &d) {
                 if(rtosc_narguments(msg) == 0)
                     d.reply(d.loc, "s", Nio::getSource().c_str());
-                else if(rtMsg<const char*> m{msg})
-                    Nio::setSource(get<0>(m));}},
+                else
+                    Nio::setSource(rtosc_argument(msg,0).s);}},
         {"sink::s", 0, 0, [](const char *msg, rtosc::RtData &d) {
                 if(rtosc_narguments(msg) == 0)
                     d.reply(d.loc, "s", Nio::getSink().c_str());
-                else if(rtMsg<const char*> m{msg})
-                    Nio::setSink(get<0>(m));}},
+                else
+                    Nio::setSink(rtosc_argument(msg,0).s);}},
     };
 }