diff --git a/cmake/apple/install_apple.sh.in b/cmake/apple/install_apple.sh.in index 02e98fdd104..6c4927e98f2 100644 --- a/cmake/apple/install_apple.sh.in +++ b/cmake/apple/install_apple.sh.in @@ -23,6 +23,12 @@ LIBREADLINE="libreadline.6.2.dylib" MSG_COLOR='\x1B[1;36m' COLOR_RESET='\x1B[0m' echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET" + +# Look for macdeployqt +which macdeployqt +if [ $? -ne 0 ]; then + export PATH=$PATH:$(brew --prefix qt5)/bin/ +fi # MacPorts only - check for u+w permissions on libreadline if [ -f "@APPLE_PREFIX@/lib/$LIBREADLINE" ]; then diff --git a/plugins/GigPlayer/CMakeLists.txt b/plugins/GigPlayer/CMakeLists.txt index 4e49988eb55..996444fff75 100644 --- a/plugins/GigPlayer/CMakeLists.txt +++ b/plugins/GigPlayer/CMakeLists.txt @@ -14,6 +14,10 @@ if(LMMS_HAVE_GIG) # Enable C++11 ADD_DEFINITIONS(-std=c++0x) + + IF(LMMS_BUILD_APPLE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + ENDIF() LINK_DIRECTORIES(${GIG_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS}) LINK_LIBRARIES(${GIG_LIBRARIES} ${SAMPLERATE_LIBRARIES}) diff --git a/plugins/MidiExport/CMakeLists.txt b/plugins/MidiExport/CMakeLists.txt index d5b08016921..96c8254bf18 100644 --- a/plugins/MidiExport/CMakeLists.txt +++ b/plugins/MidiExport/CMakeLists.txt @@ -3,5 +3,9 @@ INCLUDE(BuildPlugin) # Enable C++11 ADD_DEFINITIONS(-std=c++0x) +IF(LMMS_BUILD_APPLE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +ENDIF() + BUILD_PLUGIN(midiexport MidiExport.cpp MidiExport.h MidiFile.hpp MOCFILES MidiExport.h) diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt index dbe9377d8eb..223963fc3ad 100644 --- a/plugins/VstEffect/CMakeLists.txt +++ b/plugins/VstEffect/CMakeLists.txt @@ -13,6 +13,10 @@ ENDIF() # Enable C++11 ADD_DEFINITIONS(-std=c++0x) +IF(LMMS_BUILD_APPLE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +ENDIF() + BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes") TARGET_LINK_LIBRARIES(vsteffect -lvstbase) diff --git a/plugins/lb302/CMakeLists.txt b/plugins/lb302/CMakeLists.txt index ba2edbd4baa..384f4ea30df 100644 --- a/plugins/lb302/CMakeLists.txt +++ b/plugins/lb302/CMakeLists.txt @@ -3,4 +3,8 @@ INCLUDE(BuildPlugin) # Enable C++11 ADD_DEFINITIONS(-std=c++0x) +IF(LMMS_BUILD_APPLE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +ENDIF() + BUILD_PLUGIN(lb302 lb302.cpp lb302.h MOCFILES lb302.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/opl2/CMakeLists.txt b/plugins/opl2/CMakeLists.txt index 785c3676ed4..9e9bd91ca57 100644 --- a/plugins/opl2/CMakeLists.txt +++ b/plugins/opl2/CMakeLists.txt @@ -3,4 +3,8 @@ INCLUDE(BuildPlugin) # Enable C++11 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +IF(LMMS_BUILD_APPLE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +ENDIF() + BUILD_PLUGIN(OPL2 opl2instrument.cpp opl2instrument.h opl.h fmopl.c fmopl.h temuopl.cpp temuopl.h MOCFILES opl2instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt index d2e84e9341e..58008fe4315 100644 --- a/plugins/vestige/CMakeLists.txt +++ b/plugins/vestige/CMakeLists.txt @@ -1,6 +1,10 @@ IF(LMMS_SUPPORT_VST) # Enable C++11 ADD_DEFINITIONS(-std=c++0x) + + IF(LMMS_BUILD_APPLE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + ENDIF() INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base") diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 0a29ce342a8..2b126998cf5 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -23,6 +23,10 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wno-write-strings -Wno-deprecated-d # Enable C++11, but only for ZynAddSubFx.cpp set_property(SOURCE ZynAddSubFx.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++0x ") + +IF(LMMS_BUILD_APPLE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +ENDIF() # link system-libraries when on win32 IF(LMMS_BUILD_WIN32)