VstEmbed: Remove obsolete CMake flags

sdasda7777 · Nov 6, 2017 · 8f80e2b · 8f80e2b
1 parent 2917acd
commit 8f80e2b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 28 deletions.
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -35,29 +35,6 @@ IF(LMMS_MINIMAL)
 	SET(PLUGIN_LIST ${MINIMAL_LIST} ${PLUGIN_LIST})
 ENDIF()
 
-OPTION(LMMS_EMBED_VST "Turn on to embed VSTs as subwindows. Turn off to open VSTs in separate windows." ON)
-
-IF(WANT_QT5)
-	OPTION(LMMS_EMBED_VST_X11 "Turn on to embed VSTs using the X11Embed protocol. Turn off to use Qt's own embedding, which may be broken with your Qt version." ON)
-ENDIF()
-
-IF(NOT LMMS_EMBED_VST OR NOT LMMS_BUILD_LINUX)
-	SET(LMMS_EMBED_VST_X11 OFF)
-ENDIF()
-
-# Qt4 has no QWindow::createWindowContainer, so we always use QX11EmbedContainer
-IF(LMMS_EMBED_VST AND NOT WANT_QT5)
-	SET(LMMS_EMBED_VST_X11 ON)
-ENDIF()
-
-IF(LMMS_EMBED_VST)
-	SET(EMBED_FLAGS "-DLMMS_EMBED_VST")
-	IF(LMMS_EMBED_VST_X11)
-		LIST(APPEND EMBED_FLAGS "-DLMMS_EMBED_VST_X11")
-	ENDIF()
-ENDIF()
-
-
 IF("${PLUGIN_LIST}" STREQUAL "")
 	SET(PLUGIN_LIST
 		${MINIMAL_LIST}

diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt
@@ -10,8 +10,6 @@ ELSE()
 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 ENDIF()
 
-ADD_DEFINITIONS(${EMBED_FLAGS})
-
 BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")
 TARGET_LINK_LIBRARIES(vsteffect -lvstbase)

diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
@@ -2,8 +2,6 @@ IF(LMMS_SUPPORT_VST)
 
 INCLUDE(BuildPlugin)
 
-ADD_DEFINITIONS(${EMBED_FLAGS})
-
 IF(LMMS_BUILD_WIN32)
 	ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
 	ADD_EXECUTABLE(RemoteVstPlugin "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp")
@@ -65,7 +63,6 @@ ADD_CUSTOM_COMMAND(
 		-std=c++0x
 		-mwindows -lpthread ${EXTRA_FLAGS} -fno-omit-frame-pointer
 		${WINE_BUILD_FLAGS}
-		${EMBED_FLAGS}
 		-o ../RemoteVstPlugin
 	COMMAND sh -c "mv ../RemoteVstPlugin.exe ../RemoteVstPlugin || true"
 	TARGET vstbase