From 35eeb557041e4763fe69cdfd8ce429d12f8d1b63 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 28 Jun 2009 23:32:48 +0200 Subject: [PATCH] Various fixes for properly building on OS X There were various (trivial) problems with settings of the build system which prevented LMMS from being built on OS X. Thanks to Daniel Klaffenbach for providing his Mac for development purposes. Signed-off-by: Tobias Doerffel (cherry picked from commit ed30985aa4449d3ca10048fe354f1b96bb05855e) --- plugins/ladspa_effect/caps/CMakeLists.txt | 7 ++---- plugins/ladspa_effect/cmt/CMakeLists.txt | 6 ++---- plugins/ladspa_effect/swh/CMakeLists.txt | 2 +- plugins/ladspa_effect/tap/CMakeLists.txt | 2 +- plugins/zynaddsubfx/CMakeLists.txt | 3 ++- plugins/zynaddsubfx/fltk/CMakeLists.txt | 26 ++++++++++++----------- plugins/zynaddsubfx/src/main.C | 3 ++- 7 files changed, 24 insertions(+), 25 deletions(-) diff --git a/plugins/ladspa_effect/caps/CMakeLists.txt b/plugins/ladspa_effect/caps/CMakeLists.txt index 9015163cf..221d047d8 100644 --- a/plugins/ladspa_effect/caps/CMakeLists.txt +++ b/plugins/ladspa_effect/caps/CMakeLists.txt @@ -19,12 +19,9 @@ ENDIF(NO_O3) IF(LMMS_BUILD_WIN32) ADD_CUSTOM_COMMAND(TARGET caps POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/caps.dll) ENDIF(LMMS_BUILD_WIN32) - -IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined") -ELSE(LMMS_BUILD_APPLE) +IF(NOT LMMS_BUILD_APPLE) SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") -ENDIF(LMMS_BUILD_APPLE) +ENDIF(NOT LMMS_BUILD_APPLE) IF(LMMS_BUILD_LINUX) SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") diff --git a/plugins/ladspa_effect/cmt/CMakeLists.txt b/plugins/ladspa_effect/cmt/CMakeLists.txt index 75df256ba..b05912fc7 100644 --- a/plugins/ladspa_effect/cmt/CMakeLists.txt +++ b/plugins/ladspa_effect/cmt/CMakeLists.txt @@ -12,11 +12,9 @@ ELSE(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES(cmt PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC") ENDIF(LMMS_BUILD_WIN32) -IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(cmt PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined") -ELSE(LMMS_BUILD_APPLE) +IF(NOT LMMS_BUILD_APPLE) SET_TARGET_PROPERTIES(cmt PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") -ENDIF(LMMS_BUILD_APPLE) +ENDIF(NOT LMMS_BUILD_APPLE) IF(LMMS_BUILD_LINUX) SET_TARGET_PROPERTIES(cmt PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") diff --git a/plugins/ladspa_effect/swh/CMakeLists.txt b/plugins/ladspa_effect/swh/CMakeLists.txt index e0b484009..fc7cac822 100644 --- a/plugins/ladspa_effect/swh/CMakeLists.txt +++ b/plugins/ladspa_effect/swh/CMakeLists.txt @@ -22,7 +22,7 @@ FOREACH(_item ${PLUGIN_SOURCES}) SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC") ENDIF(LMMS_BUILD_WIN32) IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined -Bsymbolic -lm") + SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") ELSE(LMMS_BUILD_APPLE) SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") ENDIF(LMMS_BUILD_APPLE) diff --git a/plugins/ladspa_effect/tap/CMakeLists.txt b/plugins/ladspa_effect/tap/CMakeLists.txt index ae4da0428..12253fcf6 100644 --- a/plugins/ladspa_effect/tap/CMakeLists.txt +++ b/plugins/ladspa_effect/tap/CMakeLists.txt @@ -10,7 +10,7 @@ FOREACH(_item ${PLUGIN_SOURCES}) ADD_CUSTOM_COMMAND(TARGET ${_plugin} POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/${_plugin}.dll) ENDIF(LMMS_BUILD_WIN32) IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined -Bsymbolic -lm") + SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") ELSE(LMMS_BUILD_APPLE) SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") ENDIF(LMMS_BUILD_APPLE) diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 88cb8a082..8899181db 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -101,6 +101,7 @@ ENDIF(LMMS_HOST_X86 OR LMMS_HOST_X86_64) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wno-write-strings -Wno-deprecated-declarations") # link default libraries +LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) LINK_LIBRARIES(${FFTW3F_LIBRARIES} -lz -lpthread ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a) # FLTK needs X @@ -116,7 +117,7 @@ ADD_DEFINITIONS(-DPTW32_STATIC_LIB) LINK_LIBRARIES(${QT_LIBRARIES} -lole32 -luuid -lcomctl32 -lgdi32) ENDIF(LMMS_BUILD_WIN32) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS}) ADD_EXECUTABLE(remote_zynaddsubfx remote_zynaddsubfx.cpp ${ZYN_SRC} ${MXML_SRC}) INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${PLUGIN_DIR}) diff --git a/plugins/zynaddsubfx/fltk/CMakeLists.txt b/plugins/zynaddsubfx/fltk/CMakeLists.txt index fd6db6e2e..70892eb5e 100644 --- a/plugins/zynaddsubfx/fltk/CMakeLists.txt +++ b/plugins/zynaddsubfx/fltk/CMakeLists.txt @@ -50,18 +50,6 @@ ELSE(WIN32) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ENDIF(WIN32) -SET(FLTK_X11 1) -SET(FLTK_APPLE 0) -IF(APPLE) - OPTION(FLTK_APPLE_X11 "Use X11 on Mac instead of Carbon" OFF) - MARK_AS_ADVANCED(FLTK_APPLE_X11) - IF(NOT FLTK_APPLE_X11) - SET(FLTK_APPLE 1) - SET(FLTK_X11 0) - OPTION(FLTK_QUARTZ "Use Quartz instead of Quickdraw" OFF) - ENDIF(NOT FLTK_APPLE_X11) -ENDIF(APPLE) - IF(UNIX) FIND_PACKAGE(X11) SET(USE_X11 1) @@ -78,6 +66,20 @@ IF(UNIX) ENDIF(X11_Xft_FOUND) ENDIF(UNIX) + +SET(FLTK_X11 1) +SET(FLTK_APPLE 0) +IF(APPLE) + OPTION(FLTK_APPLE_X11 "Use X11 on Mac instead of Carbon" OFF) + MARK_AS_ADVANCED(FLTK_APPLE_X11) + IF(NOT FLTK_APPLE_X11) + SET(FLTK_APPLE 1) + SET(FLTK_X11 0) + SET(USE_X11 0) + OPTION(FLTK_QUARTZ "Use Quartz instead of Quickdraw" ON) + ENDIF(NOT FLTK_APPLE_X11) +ENDIF(APPLE) + IF(APPLE AND NOT FLTK_APPLE_X11) SET( FLTK_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz") diff --git a/plugins/zynaddsubfx/src/main.C b/plugins/zynaddsubfx/src/main.C index b084d55f7..fd94be8c0 100644 --- a/plugins/zynaddsubfx/src/main.C +++ b/plugins/zynaddsubfx/src/main.C @@ -99,9 +99,10 @@ void set_realtime(){ sched_param sc; sc.sched_priority=50; - +#ifndef LMMS_BUILD_APPLE //if you want get "sched_setscheduler undeclared" from compilation, you can safely remove the folowing line sched_setscheduler(0,SCHED_FIFO,&sc); +#endif // if (err==0) printf("Real-time"); #endif };