From 4db1099f7f33df7888ff9a98c4d1035ffc60280d Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Tue, 22 Jul 2008 21:47:31 +0000
Subject: [PATCH] fixed clean-target

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1359 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 CMakeLists.txt                     |  3 ++-
 ChangeLog                          |  4 ++++
 cmake/modules/BuildPlugin.cmake    |  2 +-
 cmake/modules/Win32Toolchain.cmake | 20 ++++++++++----------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32c5183c9..add2d5f11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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/*")
 
 
 #
diff --git a/ChangeLog b/ChangeLog
index 750e9d36c..70faa0f7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
index 9367cad8f..8dbbd53d9 100644
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -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)
 
diff --git a/cmake/modules/Win32Toolchain.cmake b/cmake/modules/Win32Toolchain.cmake
index 724438b13..41f1dfd22 100644
--- a/cmake/modules/Win32Toolchain.cmake
+++ b/cmake/modules/Win32Toolchain.cmake
@@ -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)