From ddd00400d2f7ba3a168a43a5f7a9ab6f5cc826e4 Mon Sep 17 00:00:00 2001
From: Matus Novak <matusnov@gmail.com>
Date: Thu, 9 May 2019 18:00:36 +0100
Subject: [PATCH] Fixing missing OSX frameworks and missing GTK 3.0
---
.circleci/config.yml | 2 +-
.travis.yml | 2 +-
CMakeLists.txt | 4 +++-
src/rew/decoder/CMakeLists.txt | 2 +-
src/rew/encoder/CMakeLists.txt | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 76a8ee4..14673d2 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 af1db24..703b97e 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 e41325a..63aaa0e 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 ae68f2f..3d7d023 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 ec713b0..9be8717 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)
--
GitLab