From 3974faca50eb03bb2e6f4ba97c7d5cd88d9cbe6b Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 4 Mar 2016 17:26:29 +0800 Subject: [PATCH] Change link method of Vestige module Try to fix #2628 --- plugins/vestige/CMakeLists.txt | 6 +++++- plugins/vst_base/CMakeLists.txt | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt index edf85da32..340e50385 100644 --- 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 index 75a3f0f18..18b944bc8 100644 --- 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)