Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compatibility with OpenAL Soft 1.20 #612

Merged
merged 1 commit into from
Jan 16, 2020
Merged

Fix compatibility with OpenAL Soft 1.20 #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -59,10 +60,6 @@ class plgAudioSys;
class plStatusLog;
class plEAXListenerMod;

typedef struct ALCdevice_struct ALCdevice;
typedef struct ALCcontext_struct ALCcontext;


class DeviceDescriptor
{
public:
Expand Down
1 change: 0 additions & 1 deletion Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class plWinAudible;
class plPlate;
class plStatusLog;
class plSpeex;
typedef struct ALCdevice_struct ALCdevice;
class plVoiceDecoder;
class plVoiceEncoder;

Expand Down
1 change: 1 addition & 0 deletions Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down