From f235a81519b90112dd68f99ae5f4a79116d4f239 Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Mon, 24 Aug 2020 10:58:22 +0200 Subject: [PATCH] Temporary fix for AeonWave support --- SimGearConfig.cmake.in | 8 -------- simgear/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/SimGearConfig.cmake.in b/SimGearConfig.cmake.in index 3ff0f4e3..7990582e 100644 --- a/SimGearConfig.cmake.in +++ b/SimGearConfig.cmake.in @@ -12,14 +12,6 @@ set(USE_AEONWAVE @USE_AEONWAVE@) set(ENABLE_ASAN @ENABLE_ASAN@) set(SIMGEAR_SHARED @SIMGEAR_SHARED@) -if (NOT SIMGEAR_SHARED AND SIMGEAR_SOUND) - if (USE_AEONWAVE) - find_dependency(AAX) - else() - #find_dependency(OpenAL) - endif() -endif() - # SSE/SSE2 support set(ENABLE_SIMD @ENABLE_SIMD@) diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt index e62d04ac..505cc005 100644 --- a/simgear/CMakeLists.txt +++ b/simgear/CMakeLists.txt @@ -163,7 +163,7 @@ if(NOT SIMGEAR_HEADLESS) target_link_libraries(SimGearScene PRIVATE ZLIB::ZLIB - ${OPENAL_LIBRARY} + ${OPENAL_LIBRARY} ${AAX_LIBRARY} ${OPENGL_LIBRARY} ${JPEG_LIBRARY}) @@ -194,4 +194,4 @@ if(NOT SIMGEAR_HEADLESS) else() target_include_directories(SimGearScene PRIVATE ${OPENAL_INCLUDE_DIR} ) endif() -endif() \ No newline at end of file +endif()