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

Merge remote-tracking branch 'lukas/cleanup/qt4'

Browse Source 
# Conflicts:
#	cmake/toolchains/common/MSYS.cmake
This commit is contained in:
Lukas W
2018-07-17 08:52:49 +02:00
parent 8cca464c27 11c693205e
commit ff1c30e35d
57 changed files with 100 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/toolchains/common/MSYS.cmake
View File

@@ -19,18 +19,4 @@ ENDIF()
SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
# Variable to assist override Qt debug libraries with release versions
SET(QT_OVERRIDE_LIBRARIES
optimized;${MINGW_PREFIX}/bin/QtGui4.dll;
optimized;${MINGW_PREFIX}/bin/QtCore4.dll;
optimized;${MINGW_PREFIX}/bin/QtXml4.dll;
debug;${MINGW_PREFIX}/bin/QtGui4.dll;
debug;${MINGW_PREFIX}/bin/QtCore4.dll;
debug;${MINGW_PREFIX}/bin/QtXml4.dll;
)
IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
# Override Qt debug libraries with release versions
SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
ENDIF()
SET(LMMS_BUILD_MSYS 1)