From 449a8b1996af54b876033ee67d365c91cefb63b0 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Mon, 6 Jan 2020 11:29:01 -0800 Subject: [PATCH] OpenAL Soft 1.20 changed the ALCdevice and ALCcontext typedefs. Since the header is very small and does not include any other headers, we can just include it directly where necessary instead of trying to forward-declare the types. --- Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt | 2 ++ Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp | 1 - Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h | 5 +---- Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.h | 1 - Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt | 1 + Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt | 2 ++ 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt index 5b0c80f280..087b488af2 100644 --- 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 index dcaca0e788..5085978594 100644 --- 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 legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" #include -#include #include #ifdef EAX_SDK_AVAILABLE #include diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h index 2944a2bf8f..8f0e71db43 100644 --- 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 legal@cyan.com #include "HeadSpin.h" #include +#include #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 index 2a8387336e..10a00086a2 100644 --- 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 index d61ea47ea4..e5a3618cbb 100644 --- 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 index 2ceedc3169..5c6ea72f62 100644 --- 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 )