From 1d32de24b7bee82f5c3e0bf8d3d43d572d36d014 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 5 Sep 2018 21:03:17 +0200
Subject: [PATCH] Allow carla-single to start plugins in bridge, add an example

---
 data/carla-single          | 13 ++++++-------
 data/windows/build-deps.sh |  4 ----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/data/carla-single b/data/carla-single
index b44398b72..446e3142d 100755
--- a/data/carla-single
+++ b/data/carla-single
@@ -59,10 +59,11 @@ $ %s dssi /usr/lib/dssi/whysynth.so
 $ %s lv2 http://calf.sourceforge.net/plugins/Compressor
 $ %s native vst /usr/lib/vst/TAL-NoiseMaker.so
 $ %s win32 vst \"~/.wine/drive_c/Program Files (x86)/VstPlugins/Kontakt 5.dll\"
+$ CARLA_BRIDGE_PLUGIN_BINARY_TYPE=win64 %s vst \"~/.wine/drive_c/Program Files/Common Files/VST2/Sytrus VSTi.dll\"
 
 Format can be skipped for internal and lv2 plugins (auto-detected), like this:
 $ %s midipattern
-$ %s http://synthv1.sourceforge.net/lv2""" % ((sys.argv[0],)*8)
+$ %s http://synthv1.sourceforge.net/lv2""" % ((sys.argv[0],)*9)
 
 def printUsageAndQuit():
     print(usageMsg)
@@ -74,7 +75,7 @@ if len(sys.argv) < 2:
 # --------------------------------------------------------------------------------------------------------
 # Initialize variables to null
 
-ARCH     = "native"
+ARCH     = os.getenv("CARLA_BRIDGE_PLUGIN_BINARY_TYPE", "native")
 FORMAT   = "none"
 FILENAME = ""
 LABEL    = ""
@@ -202,10 +203,6 @@ if FILENAME and not os.path.exists(FILENAME):
 # --------------------------------------------------------------------------------------------------------
 # Setup environment
 
-#os.environ["ENGINE_OPTION_UIS_ALWAYS_ON_TOP"]  = "false"
-#os.environ["ENGINE_OPTION_MAX_PARAMETERS"]     = "200"
-#os.environ["ENGINE_OPTION_UI_BRIDGES_TIMEOUT"] = "3000"
-
 LADSPA_PATH = os.getenv("LADSPA_PATH")
 DSSI_PATH   = os.getenv("DSSI_PATH")
 LV2_PATH    = os.getenv("LV2_PATH")
@@ -240,7 +237,9 @@ else:
 
 command = []
 
-if ARCH == "win32":
+if os.getenv("CARLA_BRIDGE_PLUGIN_BINARY_TYPE") is not None:
+    BRIDGE = os.path.join(CARLA_LIBDIR, "carla-bridge-native")
+elif ARCH == "win32":
     command.append("wine")
 elif ARCH == "win64":
     command.append("wine64")
diff --git a/data/windows/build-deps.sh b/data/windows/build-deps.sh
index b4fc62255..715af8dbd 100755
--- a/data/windows/build-deps.sh
+++ b/data/windows/build-deps.sh
@@ -113,10 +113,6 @@ export WINDRES=${MINGW_PREFIX}-windres
 
 export PATH=/opt/mingw${ARCH}/${MINGW_PREFIX}/bin:/opt/mingw${ARCH}/bin:${PATH}
 
-# export MOC=${MINGW_PREFIX}-moc
-# export RCC=${MINGW_PREFIX}-rcc
-# export PKGCONFIG=${MINGW_PREFIX}-pkg-config
-
 if [ -z "${NOSSE}" ]; then
 export CFLAGS="-O3 -mtune=generic -msse -msse2 -mfpmath=sse -fvisibility=hidden -fdata-sections -ffunction-sections"
 else