properly build on OS X

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1709 0778d3d1-df1d-0410-868b-ea421aaaa00d

CMakeLists.txt

@@ -590,8 +590,16 @@ MESSAGE(
 INCLUDE(InstallRequiredSystemLibraries)
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Linux MultiMedia Studio - easy music production for everyone!")
 SET(CPACK_PACKAGE_VENDOR "LMMS Developers")
+IF(LMMS_BUILD_APPLE)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README.txt COPYONLY)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/COPYING ${CMAKE_BINARY_DIR}/COPYING.txt COPYONLY)
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt")
+ELSE(LMMS_BUILD_APPLE)
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+ENDIF(LMMS_BUILD_APPLE)
+
 SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}-${VERSION_SUFFIX}")

ChangeLog

@@ -1,5 +1,15 @@
 2008-09-24	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* plugins/ladspa_effect/cmt/src/syndrum.cpp:
+	* plugins/ladspa_effect/cmt/src/vcf303.cpp:
+	* plugins/ladspa_effect/cmt/src/canyondelay.cpp:
+	* plugins/ladspa_effect/cmt/src/lofi.cpp:
+	* plugins/ladspa_effect/cmt/src/phasemod.cpp:
+	* plugins/ladspa_effect/cmt/src/analogue.cpp:
+	* plugins/ladspa_effect/swh/CMakeLists.txt:
+	* CMakeLists.txt:
+	properly build on OS X
+
 	* src/core/main.cpp:
 	do not show splash if environment variable NOSPLASH is set
 
@@ -10,6 +20,10 @@
 	* src/core/sample_record_handle.cpp:
 	* src/tracks/sample_track.cpp:
 	* plugins/bit_invader/bit_invader.cpp:
+	* plugins/sid/wave.cc:
+	* plugins/sid/sid.cc:
+	* plugins/sid/sid.h:
+	* plugins/sid/filter.cc:
 	fixed compiler warnings
 
 	* src/gui/controller_connection_dialog.cpp:

plugins/ladspa_effect/cmt/src/analogue.cpp

@@ -24,7 +24,6 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
 #include <math.h>
 #include <stdlib.h>
 #include "cmt.h"

plugins/ladspa_effect/cmt/src/canyondelay.cpp

@@ -25,7 +25,7 @@
 /*****************************************************************************/
 
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <math.h>
 #include "cmt.h"
 

plugins/ladspa_effect/cmt/src/lofi.cpp

@@ -24,7 +24,6 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
 #include <math.h>
 #include <stdlib.h>
 #include "cmt.h"

plugins/ladspa_effect/cmt/src/phasemod.cpp

@@ -24,7 +24,6 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
 #include <math.h>
 #include <stdlib.h>
 #include "cmt.h"

plugins/ladspa_effect/cmt/src/syndrum.cpp

@@ -24,7 +24,7 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <math.h>
 #include "cmt.h"
 

plugins/ladspa_effect/cmt/src/vcf303.cpp

@@ -26,7 +26,7 @@
 /*****************************************************************************/
 
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <math.h>
 #include "cmt.h"
 

plugins/ladspa_effect/swh/CMakeLists.txt

@@ -2,6 +2,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR})
 
 ADD_DEFINITIONS(-DFFTW3)
 IF(LMMS_HAVE_FFTW3F)
+INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
+LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
 LINK_LIBRARIES(-lfftw3f)
 ENDIF(LMMS_HAVE_FFTW3F)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})