fly/flightgear
1
0
Fork 0
Code Activity

Follow SimGear OpenAL-soft behaviour

Browse source 
When Simgear is using OpenAL-soft, follow its behaviour for
IAXClient.
This commit is contained in:
James Turner 2021-12-24 13:27:25 +00:00
parent 93d278d63a
commit 4bcfe6cd64
2 changed files with 13 additions and 2 deletions
3rdparty/iaxclient/lib
CMakeLists.txtaudio_openal.c

13
3rdparty/iaxclient/lib/CMakeLists.txt vendored
View file

@ -18,7 +18,13 @@ set(LIBIAX2_SOURCES
libiax2/src/md5.c libiax2/src/md5.c
) )
find_package(OpenAL REQUIRED) if (SG_SOUND_USES_OPENALSOFT)
message(STATUS "Using OpenAL-soft for IAX OpenAL backend")
find_package(OpenAL CONFIG REQUIRED)
else()
find_package(OpenAL REQUIRED)
endif()
add_library(iaxclient_lib STATIC add_library(iaxclient_lib STATIC
${IAXCLIENT_BASE_SOURCES} ${LIBIAX2_SOURCES} ${IAXCLIENT_BASE_SOURCES} ${LIBIAX2_SOURCES}
@ -30,6 +36,11 @@ target_include_directories(iaxclient_lib PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/
target_compile_definitions(iaxclient_lib PRIVATE AUDIO_OPENAL=1 LIBIAX LIBVER="SVN 261") target_compile_definitions(iaxclient_lib PRIVATE AUDIO_OPENAL=1 LIBIAX LIBVER="SVN 261")
# pass this through since it affects how we include al.h
if (SG_SOUND_USES_OPENALSOFT)
target_compile_definitions(iaxclient_lib PRIVATE SG_SOUND_USES_OPENALSOFT)
endif()
if (APPLE) if (APPLE)
target_compile_definitions(iaxclient_lib PRIVATE MACOSX) target_compile_definitions(iaxclient_lib PRIVATE MACOSX)
endif(APPLE) endif(APPLE)

2
3rdparty/iaxclient/lib/audio_openal.c vendored
View file

@ -1,6 +1,6 @@
#include "iaxclient_lib.h" #include "iaxclient_lib.h"
#ifdef __APPLE__ #if defined(__APPLE__) && !defined(SG_SOUND_USES_OPENALSOFT)
#include <OpenAL/al.h> #include <OpenAL/al.h>
#include <OpenAL/alc.h> #include <OpenAL/alc.h>
#elif defined(OPENALSDK) #elif defined(OPENALSDK)