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

Enable auto-uploading of PRs (#4041)

Browse Source 
Removes Qt4 from build system
Uploads PRs to transfer.sh
This commit is contained in:
Tres Finocchiaro
2017-12-23 02:23:32 -05:00
committed by GitHub
parent 07de45347a
commit 7f9d01e3b6
21 changed files with 96 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/LadspaEffect/CMakeLists.txt
View File

@@ -4,8 +4,13 @@ BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialo
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ladspa")
# Disable C++11
SET(CMAKE_CXX_STANDARD 98)
# Enable C++11 for all except mingw builds
# TODO: Validate against modern mingw compiler
IF(NOT MINGW_PREFIX)
SET(CMAKE_CXX_STANDARD 11)
ELSE()
SET(CMAKE_CXX_STANDARD 98)
ENDIF()
IF(WANT_CAPS)
ADD_SUBDIRECTORY(caps)

7
plugins/vst_base/CMakeLists.txt
View File

@@ -6,11 +6,7 @@ IF(LMMS_BUILD_WIN32)
ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
ADD_EXECUTABLE(RemoteVstPlugin "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp")
IF(QT5)
TARGET_LINK_LIBRARIES(RemoteVstPlugin Qt5::Core)
ELSE()
TARGET_LINK_LIBRARIES(RemoteVstPlugin -lQtCore4)
ENDIF()
TARGET_LINK_LIBRARIES(RemoteVstPlugin Qt5::Core)
TARGET_LINK_LIBRARIES(RemoteVstPlugin -lpthread -lgdi32 -lws2_32)
SET_TARGET_PROPERTIES(RemoteVstPlugin PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -O0")
ADD_CUSTOM_COMMAND(TARGET RemoteVstPlugin POST_BUILD COMMAND "${STRIP}" "$<TARGET_FILE:RemoteVstPlugin>")
@@ -26,6 +22,7 @@ ENDIF(LMMS_BUILD_WIN32)
SET(REMOTE_VST_PLUGIN_FILEPATH "RemoteVstPlugin" CACHE STRING "Relative file path to RemoteVstPlugin")
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src/3rdparty/qt5-x11embed/src/")
ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH="${REMOTE_VST_PLUGIN_FILEPATH}")
BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h)

6
plugins/vst_base/Win64/CMakeLists.txt
View File

@@ -3,11 +3,7 @@ SET(CMAKE_CXX_COMPILER "${CMAKE_CXX_COMPILER32}")
ADD_EXECUTABLE(RemoteVstPlugin32 "${CMAKE_CURRENT_SOURCE_DIR}/../RemoteVstPlugin.cpp")
IF(QT5)
SET(QTCORE "Qt5Core")
ELSE()
SET(QTCORE "QtCore4")
ENDIF()
SET(QTCORE "Qt5Core")
TARGET_LINK_LIBRARIES(RemoteVstPlugin32 -l${QTCORE} -lpthread -lgdi32 -lws2_32)
ADD_CUSTOM_COMMAND(TARGET RemoteVstPlugin32 POST_BUILD COMMAND "${STRIP}" "$<TARGET_FILE:RemoteVstPlugin32>")

6
plugins/zynaddsubfx/CMakeLists.txt
View File

@@ -127,9 +127,7 @@ IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
TARGET_LINK_LIBRARIES(ZynAddSubFxCore QtCore4 QtGui4 QtXml4)
ENDIF()
IF(QT5)
TARGET_LINK_LIBRARIES(ZynAddSubFxCore Qt5::Widgets Qt5::Xml)
ENDIF()
IF(LMMS_BUILD_WIN32)
TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lws2_32)
@@ -179,9 +177,7 @@ TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -lZynAddSubFxCore ${FLTK
ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
# Support qt_version_tag in Qt 5.6
IF(QT5)
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx Qt5::Core)
ENDIF(QT5)
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx Qt5::Core)
# link Qt libraries when on win32
IF(LMMS_BUILD_WIN32)