From 4b8cf97af3fdc2b5b114a89c8311c9315e35803e Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Sun, 24 Apr 2016 18:52:43 +0200
Subject: [PATCH] Compile VST plugins without Wine

---
 CMakeLists.txt                  | 3 +++
 plugins/vst_base/CMakeLists.txt | 3 +++
 plugins/vst_base/VstPlugin.cpp  | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 917b38180..e099d3809 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,6 +406,9 @@ IF(WANT_VST)
 	IF(WINE_FOUND)
 		SET(LMMS_SUPPORT_VST TRUE)
 		SET(STATUS_VST "OK")
+	ELSEIF(WANT_VST_NOWINE)
+		SET(LMMS_SUPPORT_VST TRUE)
+		SET(STATUS_VST "OK")
 	ELSE(WINE_FOUND)
 		SET(STATUS_VST "not found, please install (lib)wine-dev (or similar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
 	ENDIF(WINE_FOUND)
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
index 18b944bc8..2d0629b52 100644
--- a/plugins/vst_base/CMakeLists.txt
+++ b/plugins/vst_base/CMakeLists.txt
@@ -24,6 +24,9 @@ IF(LMMS_BUILD_WIN32)
 	ENDIF(LMMS_BUILD_WIN64 AND NOT LMMS_BUILD_MSYS)
 ENDIF(LMMS_BUILD_WIN32)
 
+SET(REMOTE_VST_PLUGIN_FILEPATH "RemoteVstPlugin" CACHE STRING "Relative file path to RemoteVstPlugin")
+
+ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH="${REMOTE_VST_PLUGIN_FILEPATH}")
 IF(LMMS_BUILD_WIN32)
 	BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h)
 ELSE()
diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index 954b6196c..d21b230b9 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -99,7 +99,7 @@ VstPlugin::VstPlugin( const QString & _plugin ) :
 {
 	setSplittedChannels( true );
 
-	tryLoad( "RemoteVstPlugin" );
+	tryLoad( REMOTE_VST_PLUGIN_FILEPATH );
 #ifdef LMMS_BUILD_WIN64
 	if( m_badDllFormat )
 	{