Merge pull request #612 from zrax/alsoft_120

Fix compatibility with OpenAL Soft 1.20
H-uru · Jan 16, 2020 · 5b855c8 · 5b855c8
2 parents 416c209 + 449a8b1
commit 5b855c8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt
@@ -4,6 +4,8 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
+include_directories(${OPENAL_INCLUDE_DIR})
+
 set(pfCamera_SOURCES
     pfCameraProxy.cpp
     plCameraBrain.cpp

diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp
@@ -41,7 +41,6 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 *==LICENSE==*/
 #include "HeadSpin.h"
 #include <al.h>
-#include <alc.h>
 #include <efx.h>
 #ifdef EAX_SDK_AVAILABLE
 #include <eax.h>

diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h
@@ -44,6 +44,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 
 #include "HeadSpin.h"
 #include <string>
+#include <alc.h>
 
 #include "hsTemplates.h"
 #include "hsGeometry3.h"
@@ -59,10 +60,6 @@ class plgAudioSys;
 class plStatusLog;
 class plEAXListenerMod;
 
-typedef struct ALCdevice_struct ALCdevice;
-typedef struct ALCcontext_struct ALCcontext;
-
-
 class DeviceDescriptor
 {
 public:

diff --git a/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.h b/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.h
@@ -66,7 +66,6 @@ class  plWinAudible;
 class  plPlate;
 class  plStatusLog;
 class  plSpeex;
-typedef struct ALCdevice_struct ALCdevice;
 class plVoiceDecoder;
 class plVoiceEncoder;
 

diff --git a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories("../../PubUtilLib")
 if(PLASMA_PIPELINE STREQUAL "DirectX")
     include_directories(${DirectX_INCLUDE_DIR})
 endif(PLASMA_PIPELINE STREQUAL "DirectX")
+include_directories(${OPENAL_INCLUDE_DIR})
 
 set(plPipeline_SOURCES
     hsG3DDeviceSelector.cpp

diff --git a/Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt b/Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
@@ -8,6 +8,8 @@ include_directories(../../../Plasma/PubUtilLib/inc)
 include_directories(../../../Plasma/FeatureLib)
 include_directories(../../../Plasma/FeatureLib/inc)
 
+include_directories(${OPENAL_INCLUDE_DIR})
+
 set(pfPythonTest_SOURCES
     test_cyMisc.cpp
     )