From 6ab8d43b041c4b09176f5443031abe7320834ba9 Mon Sep 17 00:00:00 2001 From: Laurent Date: Sat, 28 Feb 2015 23:38:22 +0100 Subject: [PATCH] Enabled sfml-audio on iOS --- src/SFML/Audio/ALCheck.hpp | 9 +++++++-- src/SFML/Audio/CMakeLists.txt | 16 +++++++++++++--- src/SFML/CMakeLists.txt | 4 +--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/SFML/Audio/ALCheck.hpp b/src/SFML/Audio/ALCheck.hpp index 1df62d7d..f8511119 100644 --- a/src/SFML/Audio/ALCheck.hpp +++ b/src/SFML/Audio/ALCheck.hpp @@ -31,8 +31,13 @@ #include #include #include -#include -#include +#ifdef SFML_SYSTEM_IOS + #include + #include +#else + #include + #include +#endif namespace sf diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt index 8fcb4883..e375057e 100644 --- a/src/SFML/Audio/CMakeLists.txt +++ b/src/SFML/Audio/CMakeLists.txt @@ -67,7 +67,9 @@ endif() # find external libraries if(NOT SFML_OS_ANDROID) - find_package(OpenAL REQUIRED) + if(NOT SFML_OS_IOS) + find_package(OpenAL REQUIRED) + endif() find_package(Vorbis REQUIRED) find_package(FLAC REQUIRED) else() @@ -75,17 +77,25 @@ else() find_host_package(Vorbis REQUIRED) find_host_package(FLAC REQUIRED) endif() -include_directories(${OPENAL_INCLUDE_DIR}) + +if(NOT SFML_OS_IOS) + include_directories(${OPENAL_INCLUDE_DIR}) +endif() include_directories(${VORBIS_INCLUDE_DIRS}) include_directories(${FLAC_INCLUDE_DIR}) add_definitions(-DOV_EXCLUDE_STATIC_CALLBACKS) # avoids warnings in vorbisfile.h add_definitions(-DFLAC__NO_DLL) # build the list of external libraries to link +if(SFML_OS_IOS) + list(APPEND AUDIO_EXT_LIBS "-framework OpenAL") +else() + list(APPEND AUDIO_EXT_LIBS ${OPENAL_LIBRARY}) +endif() if(SFML_OS_ANDROID) list(APPEND AUDIO_EXT_LIBS android OpenSLES) endif() -list(APPEND AUDIO_EXT_LIBS ${OPENAL_LIBRARY} ${VORBIS_LIBRARIES} ${FLAC_LIBRARY}) +list(APPEND AUDIO_EXT_LIBS ${VORBIS_LIBRARIES} ${FLAC_LIBRARY}) # define the sfml-audio target sfml_add_library(sfml-audio diff --git a/src/SFML/CMakeLists.txt b/src/SFML/CMakeLists.txt index 1bbfc7fb..392ed823 100644 --- a/src/SFML/CMakeLists.txt +++ b/src/SFML/CMakeLists.txt @@ -48,6 +48,4 @@ endif() add_subdirectory(Window) add_subdirectory(Network) add_subdirectory(Graphics) -if(NOT SFML_OS_IOS) - add_subdirectory(Audio) -endif() +add_subdirectory(Audio)