Modify VST build systems to make debian integration work correctly

plugins/vst_base/CMakeLists.txt

@@ -5,11 +5,11 @@ ENDIF()
 INCLUDE(BuildPlugin)
 INCLUDE(ExternalProject)
 
-ADD_SUBDIRECTORY(vstbase)
+# These variables are not meant to be used normally, except packaging
+SET(REMOTE_VST_PLUGIN_FILEPATH_32 "32/RemoteVstPlugin32" CACHE STRING "Relative file path to RemoteVstPlugin32")
+SET(REMOTE_VST_PLUGIN_FILEPATH_64 "RemoteVstPlugin64" CACHE STRING "Relative file path to RemoteVstPlugin64")
 
-IF(LMMS_BUILD_LINUX AND WANT_VST_NOWINE)
-	RETURN()
-ENDIF()
+ADD_SUBDIRECTORY(vstbase)
 
 SET(LMMS_BINARY_DIR ${CMAKE_BINARY_DIR})
 SET(LMMS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
@@ -29,6 +29,10 @@ SET(EXTERNALPROJECT_CMAKE_ARGS
 )
 
 # build 32 bit version of RemoteVstPlugin
-INCLUDE("${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin32.cmake")
+IF(WANT_VST_32)
+	INCLUDE("${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin32.cmake")
+ENDIF()
 # build 64 bit version of RemoteVstPlugin
-INCLUDE("${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin64.cmake")
+IF(WANT_VST_64)
+	INCLUDE("${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin64.cmake")
+ENDIF()

plugins/vst_base/VstPlugin.cpp

@@ -149,10 +149,10 @@ VstPlugin::VstPlugin( const QString & _plugin ) :
 	switch(machineType)
 	{
 	case PE::MachineType::amd64:
-		tryLoad( "RemoteVstPlugin64" );
+		tryLoad( REMOTE_VST_PLUGIN_FILEPATH_64 ); // Default: RemoteVstPlugin64
 		break;
 	case PE::MachineType::i386:
-		tryLoad( "32/RemoteVstPlugin32" );
+		tryLoad( REMOTE_VST_PLUGIN_FILEPATH_32 ); // Default: 32/RemoteVstPlugin32
 		break;
 	default:
 		m_failed = true;

plugins/vst_base/vstbase/CMakeLists.txt

@@ -1,3 +1,6 @@
+ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH_32="${REMOTE_VST_PLUGIN_FILEPATH_32}")
+ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH_64="${REMOTE_VST_PLUGIN_FILEPATH_64}")
+
 BUILD_PLUGIN(vstbase
 	../vst_base.cpp ../VstPlugin.cpp ../VstPlugin.h ../communication.h
 	MOCFILES ../VstPlugin.h