Merge pull request #2632 from liushuyu/master

Change link method of Vestige module
LMMS · Mar 4, 2016 · 76bd181 · 76bd181
2 parents 020b4dd + 3974fac
commit 76bd181
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt
@@ -3,6 +3,10 @@ IF(LMMS_SUPPORT_VST)
    INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
    LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
    LINK_LIBRARIES(vstbase)
-   BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+   IF(LMMS_BUILD_WIN32)
+	BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+   ELSE()
+	BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png" LINK SHARED)
+   ENDIF()
 ENDIF(LMMS_SUPPORT_VST)
 
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
@@ -24,8 +24,11 @@ IF(LMMS_BUILD_WIN32)
 	ENDIF(LMMS_BUILD_WIN64 AND NOT LMMS_BUILD_MSYS)
 ENDIF(LMMS_BUILD_WIN32)
 
-BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h)
-
+IF(LMMS_BUILD_WIN32)
+	BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h)
+ELSE()
+	BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h LINK SHARED)
+ENDIF()
 
 IF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)