FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporary fix for AeonWave support

Browse Source
This commit is contained in:
Erik Hofman 2020-08-24 10:58:22 +02:00
parent 5b0f44f0db
commit f235a81519
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SimGearConfig.cmake.in
View File

@ -12,14 +12,6 @@ set(USE_AEONWAVE @USE_AEONWAVE@)
set(ENABLE_ASAN @ENABLE_ASAN@) set(ENABLE_ASAN @ENABLE_ASAN@)
set(SIMGEAR_SHARED @SIMGEAR_SHARED@) 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 # SSE/SSE2 support
set(ENABLE_SIMD @ENABLE_SIMD@) set(ENABLE_SIMD @ENABLE_SIMD@)

4
simgear/CMakeLists.txt
View File

@ -163,7 +163,7 @@ if(NOT SIMGEAR_HEADLESS)
target_link_libraries(SimGearScene PRIVATE target_link_libraries(SimGearScene PRIVATE
ZLIB::ZLIB ZLIB::ZLIB
${OPENAL_LIBRARY} ${OPENAL_LIBRARY} ${AAX_LIBRARY}
${OPENGL_LIBRARY} ${OPENGL_LIBRARY}
${JPEG_LIBRARY}) ${JPEG_LIBRARY})
@ -194,4 +194,4 @@ if(NOT SIMGEAR_HEADLESS)
else() else()
target_include_directories(SimGearScene PRIVATE ${OPENAL_INCLUDE_DIR} ) target_include_directories(SimGearScene PRIVATE ${OPENAL_INCLUDE_DIR} )
endif() endif()
endif() endif()