From f963faa694ad4a640e7a6bc6852bb0604b4fa9dc Mon Sep 17 00:00:00 2001 From: Jonny Paton Date: Fri, 23 Feb 2018 17:04:29 -0800 Subject: [PATCH] Find OpenAL correctly on iOS --- src/SFML/Audio/ALCheck.hpp | 9 ++------- src/SFML/Audio/CMakeLists.txt | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/SFML/Audio/ALCheck.hpp b/src/SFML/Audio/ALCheck.hpp index fc497a2d..c67d117d 100644 --- a/src/SFML/Audio/ALCheck.hpp +++ b/src/SFML/Audio/ALCheck.hpp @@ -29,14 +29,9 @@ // Headers //////////////////////////////////////////////////////////// #include -#ifdef SFML_SYSTEM_IOS - #include - #include -#else - #include - #include -#endif +#include +#include namespace sf { diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt index 363bf44f..65c0fc8f 100644 --- a/src/SFML/Audio/CMakeLists.txt +++ b/src/SFML/Audio/CMakeLists.txt @@ -67,9 +67,7 @@ endif() # find external libraries if(SFML_OS_IOS) - if(NOT SFML_OS_IOS) - find_host_package(OpenAL REQUIRED) - endif() + find_host_package(OpenAL REQUIRED) find_host_package(Vorbis REQUIRED) find_host_package(FLAC REQUIRED) else() @@ -78,9 +76,7 @@ else() find_package(FLAC REQUIRED) endif() -if(NOT SFML_OS_IOS) - include_directories(${OPENAL_INCLUDE_DIR}) -endif() +include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${VORBIS_INCLUDE_DIRS}) include_directories(${FLAC_INCLUDE_DIR}) add_definitions(-DOV_EXCLUDE_STATIC_CALLBACKS) # avoids warnings in vorbisfile.h