diff --git a/.circleci/config.yml b/.circleci/config.yml index 76a8ee4f72180582f4f2ef109529c5705beec809..14673d26f62c8006babb3d12b7ee5d4b13ba25a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ compile_gcc: &compile_gcc ln -s $DIR/cmake-3.10.2-Linux-x86_64/bin/cpack /usr/bin/cpack ln -s $DIR/cmake-3.10.2-Linux-x86_64/bin/ctest /usr/bin/ctest apt-get update - apt-get install libasound-dev zip -y + apt-get install libasound-dev zip libgtk-3-dev -y - run: name: Init submodules command: | diff --git a/.travis.yml b/.travis.yml index af1db2485fe96357a7808611b8e96d3ce5871f2b..703b97e2faa76825eec14da714e1f4d15816a916 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: - export CURRENT_BRANCH=$TRAVIS_BRANCH - if [ $TRAVIS_OS_NAME == linux ]; then sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-7 /usr/bin/gcc; fi - if [ $TRAVIS_OS_NAME == linux ]; then sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-7 /usr/bin/g++; fi - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install libasound-dev -y; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install libasound-dev libgtk-3-dev zip -y; fi - gcc --version - g++ --version - mkdir build diff --git a/CMakeLists.txt b/CMakeLists.txt index e41325a1c18607e191bdd9c1989f9c6408c0541f..63aaa0e94b1aa0f14ec528df7f14d6f72ff88460 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,9 @@ find_package(Threads) # Platform specific libraries if(APPLE) find_library(COREAUDIO_LIBRARY CoreAudio) - find_library(COREFOUNDATION_LIBRARY CoreFoundation ) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + find_library(AUDIOUNIT_LIBRARY AudioUnit) + find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox) endif(APPLE) # Our subdirectories diff --git a/src/rew/decoder/CMakeLists.txt b/src/rew/decoder/CMakeLists.txt index ae68f2f1ea400f76689e842140ff3276779d9050..3d7d023b0c86948127bae9c968464094bd6336f6 100644 --- a/src/rew/decoder/CMakeLists.txt +++ b/src/rew/decoder/CMakeLists.txt @@ -32,7 +32,7 @@ if(MINGW) target_link_libraries(${PROJECT_NAME} Winmm SetupAPI) endif() if(APPLE) - target_link_libraries(${PROJECT_NAME} ${COREAUDIO_LIBRARY} ${COREFOUNDATION_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${COREAUDIO_LIBRARY} ${COREFOUNDATION_LIBRARY} ${AUDIOUNIT_LIBRARY} ${AUDIOTOOLBOX_LIBRARY}) endif(APPLE) diff --git a/src/rew/encoder/CMakeLists.txt b/src/rew/encoder/CMakeLists.txt index ec713b0967515f65b569509f9918aa33fbfb0c50..9be8717a2f909d3e33251db70636483a6e7e2059 100644 --- a/src/rew/encoder/CMakeLists.txt +++ b/src/rew/encoder/CMakeLists.txt @@ -28,7 +28,7 @@ if(MINGW) target_link_libraries(${PROJECT_NAME} Winmm SetupAPI) endif() if(APPLE) - target_link_libraries(${PROJECT_NAME} ${COREAUDIO_LIBRARY} ${COREFOUNDATION_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${COREAUDIO_LIBRARY} ${COREFOUNDATION_LIBRARY} ${AUDIOUNIT_LIBRARY} ${AUDIOTOOLBOX_LIBRARY}) endif(APPLE) set(ENCODER_PROJECT ${PROJECT_NAME} PARENT_SCOPE)