From b1d2c3ab545d6f6a298614e9c952884b18821c78 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 24 Sep 2008 09:33:45 +0000 Subject: [PATCH] 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 | 8 ++++++++ ChangeLog | 14 ++++++++++++++ plugins/ladspa_effect/cmt/src/analogue.cpp | 1 - plugins/ladspa_effect/cmt/src/canyondelay.cpp | 2 +- plugins/ladspa_effect/cmt/src/lofi.cpp | 1 - plugins/ladspa_effect/cmt/src/phasemod.cpp | 1 - plugins/ladspa_effect/cmt/src/syndrum.cpp | 2 +- plugins/ladspa_effect/cmt/src/vcf303.cpp | 2 +- plugins/ladspa_effect/swh/CMakeLists.txt | 2 ++ 9 files changed, 27 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d1df0c44..3bb944859 100644 --- a/CMakeLists.txt +++ b/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}") diff --git a/ChangeLog b/ChangeLog index 2194545e8..f7c8173bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2008-09-24 Tobias Doerffel + * 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: diff --git a/plugins/ladspa_effect/cmt/src/analogue.cpp b/plugins/ladspa_effect/cmt/src/analogue.cpp index 797025eed..5a8dc265c 100644 --- a/plugins/ladspa_effect/cmt/src/analogue.cpp +++ b/plugins/ladspa_effect/cmt/src/analogue.cpp @@ -24,7 +24,6 @@ /*****************************************************************************/ -#include #include #include #include "cmt.h" diff --git a/plugins/ladspa_effect/cmt/src/canyondelay.cpp b/plugins/ladspa_effect/cmt/src/canyondelay.cpp index 55377f9f7..23651bd50 100644 --- a/plugins/ladspa_effect/cmt/src/canyondelay.cpp +++ b/plugins/ladspa_effect/cmt/src/canyondelay.cpp @@ -25,7 +25,7 @@ /*****************************************************************************/ -#include +#include #include #include "cmt.h" diff --git a/plugins/ladspa_effect/cmt/src/lofi.cpp b/plugins/ladspa_effect/cmt/src/lofi.cpp index dd7f4bd73..d4572f98b 100644 --- a/plugins/ladspa_effect/cmt/src/lofi.cpp +++ b/plugins/ladspa_effect/cmt/src/lofi.cpp @@ -24,7 +24,6 @@ /*****************************************************************************/ -#include #include #include #include "cmt.h" diff --git a/plugins/ladspa_effect/cmt/src/phasemod.cpp b/plugins/ladspa_effect/cmt/src/phasemod.cpp index cd8a96e0c..0a8c8e27c 100644 --- a/plugins/ladspa_effect/cmt/src/phasemod.cpp +++ b/plugins/ladspa_effect/cmt/src/phasemod.cpp @@ -24,7 +24,6 @@ /*****************************************************************************/ -#include #include #include #include "cmt.h" diff --git a/plugins/ladspa_effect/cmt/src/syndrum.cpp b/plugins/ladspa_effect/cmt/src/syndrum.cpp index f8e15777d..0ff2e9b39 100644 --- a/plugins/ladspa_effect/cmt/src/syndrum.cpp +++ b/plugins/ladspa_effect/cmt/src/syndrum.cpp @@ -24,7 +24,7 @@ /*****************************************************************************/ -#include +#include #include #include "cmt.h" diff --git a/plugins/ladspa_effect/cmt/src/vcf303.cpp b/plugins/ladspa_effect/cmt/src/vcf303.cpp index 4bf83642f..734850ec6 100644 --- a/plugins/ladspa_effect/cmt/src/vcf303.cpp +++ b/plugins/ladspa_effect/cmt/src/vcf303.cpp @@ -26,7 +26,7 @@ /*****************************************************************************/ -#include +#include #include #include "cmt.h" diff --git a/plugins/ladspa_effect/swh/CMakeLists.txt b/plugins/ladspa_effect/swh/CMakeLists.txt index f66650d40..d5a7b61c8 100644 --- a/plugins/ladspa_effect/swh/CMakeLists.txt +++ b/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})