From 1af455da9e169cdc935ea9ffe53479f5d5032393 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Mon, 2 Feb 2015 07:25:52 +0000
Subject: [PATCH] Misc

---
 source/backend/CarlaUtils.cpp  | 14 ++++++++++----
 source/bridges-plugin/Makefile |  9 +--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/source/backend/CarlaUtils.cpp b/source/backend/CarlaUtils.cpp
index 9e61a5459..979b3a6c2 100644
--- a/source/backend/CarlaUtils.cpp
+++ b/source/backend/CarlaUtils.cpp
@@ -230,6 +230,12 @@ const char* carla_get_complete_license_text()
         "<p>This current Carla build is using the following features and 3rd-party code:</p>"
         "<ul>"
 
+#if defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN) || ! defined(VESTIGE_HEADER)
+# define LS_NOTE_NO "2"
+#else
+# define LS_NOTE_NO "1"
+#endif
+
         // Plugin formats
         "<li>LADSPA plugin support</li>"
         "<li>DSSI plugin support</li>"
@@ -251,12 +257,12 @@ const char* carla_get_complete_license_text()
         "<li>FluidSynth library for SF2 support</li>"
 #endif
 #ifdef HAVE_LINUXSAMPLER
-        "<li>LinuxSampler library for GIG and SFZ support [2]</li>"
+        "<li>LinuxSampler library for GIG and SFZ support [" LS_NOTE_NO "]</li>"
 #endif
 
         // Internal plugins
         "<li>NekoFilter plugin code based on lv2fil by Nedko Arnaudov and Fons Adriaensen</li>"
-#ifdef WANT_ZYNADDSUBFX
+#ifdef HAVE_ZYN_DEPS
         "<li>ZynAddSubFX plugin code</li>"
 #endif
 
@@ -282,7 +288,7 @@ const char* carla_get_complete_license_text()
 #endif
 #ifdef HAVE_LINUXSAMPLER
         // LinuxSampler GPL exception
-        "&nbsp;[2] Using LinuxSampler code in commercial hardware or software products is not allowed without prior written authorization by the authors."
+        "&nbsp;[" LS_NOTE_NO "] Using LinuxSampler code in commercial hardware or software products is not allowed without prior written authorization by the authors."
 #endif
         "</p>"
         ;
@@ -329,7 +335,7 @@ const char* carla_get_supported_file_extensions()
         // linuxsampler (gig and sfz)
         ";*.gig;*.sfz"
 #endif
-#ifdef WANT_ZYNADDSUBFX
+#ifdef HAVE_ZYN_DEPS
         // zynaddsubfx presets
         ";*.xmz;*.xiz"
 #endif
diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile
index 716e9ab76..4f1a78e64 100644
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -126,7 +126,7 @@ endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-NATIVE_BUILD_FLAGS  =
+NATIVE_BUILD_FLAGS  = $(NATIVE_PLUGINS_FLAGS)
 NATIVE_LINK_FLAGS   =
 
 ifeq ($(HAVE_FLUIDSYNTH),true)
@@ -139,13 +139,6 @@ NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLAGS)
 NATIVE_LINK_FLAGS  += $(LINUXSAMPLER_LIBS)
 endif
 
-ifeq ($(HAVE_ZYN_DEPS),true)
-NATIVE_BUILD_FLAGS += -DWANT_ZYNADDSUBFX
-ifeq ($(HAVE_ZYN_UI_DEPS),true)
-NATIVE_BUILD_FLAGS += -DWANT_ZYNADDSUBFX_UI
-endif
-endif
-
 LIBS_native        += $(MODULEDIR)/juce_audio_formats.a
 NATIVE_LINK_FLAGS  += $(JUCE_AUDIO_FORMATS_LIBS)