hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

made building the WINE-part of VST Support Layer optional to allow packaging it in separate package (e.g. on 64 bit platforms)

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1800 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-10-25 14:01:13 +00:00
parent 2518ba1490
commit 061333bb7c
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -42,6 +42,7 @@ OPTION(WANT_SYSTEM_SR "Use system's libsamplerate" ON)
OPTION(WANT_SWH "Include Steve Harris's LADSPA plugins" ON)
OPTION(WANT_TAP "Include Tom's Audio Processing LADSPA plugins" ON)
OPTION(WANT_VST "Include VST support" ON)
OPTION(WANT_VST_NOWINE "Include partial VST support (without wine)" OFF)
OPTION(WANT_WINMM "Include WinMM MIDI support" OFF)
IF(LMMS_BUILD_WIN32)
@@ -298,14 +299,14 @@ IF(WANT_VST)
SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_ORIG})
SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_ORIG})
IF(HAVE_LIBWINE AND HAVE_WINDOWS_H)
SET(LMMS_HAVE_VST TRUE)
SET(LMMS_SUPPORT_VST TRUE)
SET(STATUS_VST "OK")
ELSE(HAVE_LIBWINE AND HAVE_WINDOWS_H)
SET(STATUS_VST "not found, please install (lib)wine-dev (or similiar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
ENDIF(HAVE_LIBWINE AND HAVE_WINDOWS_H)
ENDIF(WANT_VST)
IF(LMMS_BUILD_WIN32)
SET(LMMS_HAVE_VST TRUE)
SET(LMMS_SUPPORT_VST TRUE)
SET(STATUS_VST "OK")
ENDIF(LMMS_BUILD_WIN32)

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2008-10-25 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/vst_effect/CMakeLists.txt:
* plugins/vestige/CMakeLists.txt:
* plugins/vst_base/CMakeLists.txt:
* CMakeLists.txt:
made building the WINE-part of VST Support Layer optional to allow
packaging it in separate package (e.g. on 64 bit platforms)
2008-10-25 dieEasy <dieeasy/at/cheapnet/dot/it>
* data/locale/it.qm:

4
plugins/vestige/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
IF(LMMS_HAVE_VST)
IF(LMMS_SUPPORT_VST)
INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES(../vst_base)
@@ -8,5 +8,5 @@ LINK_LIBRARIES(vstbase)
BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
SET_TARGET_PROPERTIES(vestige PROPERTIES COMPILE_FLAGS "-D_FORTIFY_SOURCE=0")
ENDIF(LMMS_HAVE_VST)
ENDIF(LMMS_SUPPORT_VST)

8
plugins/vst_base/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
IF(LMMS_HAVE_VST)
IF(LMMS_SUPPORT_VST)
INCLUDE(BuildPlugin)
@@ -14,7 +14,7 @@ IF(LMMS_BUILD_WIN32)
ENDIF(LMMS_BUILD_WIN32)
IF(LMMS_BUILD_LINUX)
IF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
IF(LMMS_HOST_X86_64)
SET(EXTRA_FLAGS -m32 -Wb,--as-cmd='as --32',--ld-cmd='ld -melf_i386' -L/usr/lib32)
@@ -31,7 +31,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugi
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR})
ENDIF(LMMS_BUILD_LINUX)
ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
ENDIF(LMMS_HAVE_VST)
ENDIF(LMMS_SUPPORT_VST)

4
plugins/vst_effect/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
IF(LMMS_HAVE_VST)
IF(LMMS_SUPPORT_VST)
INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES(../vst_base)
@@ -9,5 +9,5 @@ BUILD_PLUGIN(vsteffect vst_effect.cpp vst_effect_controls.cpp vst_effect_control
SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")
ENDIF(LMMS_HAVE_VST)
ENDIF(LMMS_SUPPORT_VST)