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

fixed clean-target

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1359 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-07-22 21:47:31 +00:00
parent d972ecb9f4
commit 4db1099f7f
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -13,6 +13,7 @@ ENDIF(COMMAND CMAKE_POLICY)
INCLUDE(AddFileDependencies)
INCLUDE(CheckIncludeFiles)
INCLUDE(FindPkgConfig)
INCLUDE(CPack)
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "4")
@@ -335,7 +336,7 @@ IF(WANT_PCH)
ENDIF(PCHSupport_FOUND)
ENDIF(WANT_PCH)
SET(ADDITIONAL_MAKE_CLEAN_FILES ${ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h pch.h.gch/*)
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h pch.h.gch/*")
#

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2008-07-22 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/project_renderer.h:
* src/core/project_renderer.cpp:
also compile without OGG/Vorbis-support
* cmake/modules/Win32Toolchain.cmake:
* cmake/modules/BuildPlugin.cmake:
* src/3rdparty/samplerate/config.h:

2
cmake/modules/BuildPlugin.cmake
View File

@@ -76,6 +76,6 @@ MACRO(BUILD_PLUGIN)
IF(LMMS_BUILD_WIN32)
SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "")
ENDIF(LMMS_BUILD_WIN32)
SET(ADDITIONAL_MAKE_CLEAN_FILES ${ER_H} ${plugin_MOC_out})
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${ER_H} ${plugin_MOC_out}")
ENDMACRO(BUILD_PLUGIN)

20
cmake/modules/Win32Toolchain.cmake
View File

@@ -15,16 +15,16 @@ SET(CMAKE_CXX_COMPILER ${CC_PREFIX}/bin/i586-mingw32-g++)
# where is the target environment
SET(CMAKE_FIND_ROOT_PATH /opt/mingw)
set(QT_BINARY_DIR ${CC_PREFIX}/bin)
set(QT_LIBRARY_DIR ${CC_PREFIX}/lib)
set(QT_QTCORE_LIBRARY ${CC_PREFIX}/lib/libQtCore4.a)
set(QT_INCLUDE_DIR ${CC_PREFIX}/include/qt4)
set(QT_QTCORE_INCLUDE_DIR ${CC_PREFIX}/include/qt4/QtCore)
set(QT_MKSPECS_DIR ${CC_PREFIX}/share/qt4/mkspecs)
set(QT_MOC_EXECUTABLE ${QT_BINARY_DIR}/moc.exe)
set(QT_RCC_EXECUTABLE ${QT_BINARY_DIR}/rcc.exe)
set(QT_QMAKE_EXECUTABLE /usr/bin/qmake)
set(QT_UIC_EXECUTABLE ${QT_BINARY_DIR}/uic.exe)
SET(QT_BINARY_DIR ${CC_PREFIX}/bin)
SET(QT_LIBRARY_DIR ${CC_PREFIX}/lib)
SET(QT_QTCORE_LIBRARY ${CC_PREFIX}/lib/libQtCore4.a)
SET(QT_INCLUDE_DIR ${CC_PREFIX}/include/qt4)
SET(QT_QTCORE_INCLUDE_DIR ${CC_PREFIX}/include/qt4/QtCore)
SET(QT_MKSPECS_DIR ${CC_PREFIX}/share/qt4/mkspecs)
SET(QT_MOC_EXECUTABLE ${QT_BINARY_DIR}/moc.exe)
SET(QT_RCC_EXECUTABLE ${QT_BINARY_DIR}/rcc.exe)
SET(QT_QMAKE_EXECUTABLE /usr/bin/qmake)
SET(QT_UIC_EXECUTABLE ${QT_BINARY_DIR}/uic.exe)
# search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)