diff --git a/.gitignore b/.gitignore index 7feb15e6..ba713f78 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,7 @@ compile_commands.json *.a *.txt.user +.DS_Store + clients/sfizz_jack clients/sfzprint diff --git a/.travis/script.sh b/.travis/script.sh index fa98dd09..5f0b6041 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -11,6 +11,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j$(nproc) elif [ "$TRAVIS_OS_NAME" = "osx" ]; then mkdir build && cd build - cmake -D CMAKE_BUILD_TYPE=Release -D SFIZZ_CLIENTS=ON -G Xcode .. + cmake -D SFIZZ_CLIENTS=OFF -G Xcode .. # FIXME: client build xcodebuild -project sfizz.xcodeproj -alltargets -configuration Release build fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 95862d44..a9c5c553 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,13 @@ if (WIN32) set_target_properties(sndfile PROPERTIES LINKER_LANGUAGE CXX) file(COPY "${WIN_SNDFILE_PATH}/bin/libsndfile-1.dll" DESTINATION ${CMAKE_BINARY_DIR}) target_include_directories(sndfile INTERFACE "${WIN_SNDFILE_PATH}/include") +elseif(APPLE) + find_path(SNDFILE_INCLUDE_DIR NAMES sndfile.hh PATHS "/usr/local/include") + find_library(SNDFILE_LIBRARY NAMES sndfile PATHS "/usr/local/lib") + message(STATUS "include dir: " ${SNDFILE_INCLUDE_DIR} " lib: " ${SNDFILE_LIBRARY}) + add_library(sndfile SHARED IMPORTED GLOBAL) + target_include_directories(sndfile INTERFACE ${SNDFILE_INCLUDE_DIR}) + target_link_libraries(sndfile INTERFACE ${SNDFILE_LIBRARY}) endif() add_subdirectory(sfizz) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index 56fe7532..0e7f525d 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -6,5 +6,14 @@ target_link_libraries(sfzprint sfizz::parser absl::flags_parse) ############################### # Basic command line program +if(APPLE) + find_path(JACK_INCLUDE_DIR NAMES jack.h PATHS "/usr/local/include/jack") + find_library(JACK_LIBRARY NAMES jack PATHS "/usr/local/lib") + message(STATUS "include dir: " ${JACK_INCLUDE_DIR} " lib: " ${JACK_LIBRARY}) + add_library(jack SHARED IMPORTED GLOBAL) + target_include_directories(jack INTERFACE ${JACK_INCLUDE_DIR}) + target_link_libraries(jack INTERFACE ${JACK_LIBRARY}) +endif() + add_executable(sfizz_jack jack_client.cpp) target_link_libraries(sfizz_jack sfizz::sfizz jack absl::flags_parse) diff --git a/sfizz/CMakeLists.txt b/sfizz/CMakeLists.txt index 8ac10141..81b792b3 100644 --- a/sfizz/CMakeLists.txt +++ b/sfizz/CMakeLists.txt @@ -14,7 +14,9 @@ set(SFIZZ_SOURCES include(CheckIncludeFiles) CHECK_INCLUDE_FILES(x86intrin.h HAVE_X86INTRIN_H) CHECK_INCLUDE_FILES(intrin.h HAVE_INTRIN_H) -CHECK_INCLUDE_FILES(arm_neon.h HAVE_ARM_NEON_H) +if (!APPLE) + CHECK_INCLUDE_FILES(arm_neon.h HAVE_ARM_NEON_H) +endif() # SIMD checks if (HAVE_X86INTRIN_H AND UNIX) @@ -71,4 +73,4 @@ target_link_libraries(sfizz PUBLIC absl::strings) target_link_libraries(sfizz PRIVATE sndfile absl::flat_hash_map) add_library(sfizz::parser ALIAS sfizz_parser) -add_library(sfizz::sfizz ALIAS sfizz) \ No newline at end of file +add_library(sfizz::sfizz ALIAS sfizz)