Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge pull request #873 from madebr/openal_static

Browse Source 
audio: define openal extensions in re3 owned namespace
This commit is contained in:
shfil 2020-12-08 16:40:57 +01:00 committed by GitHub
commit 95094e45af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/audio/oal/oal_utils.cpp
View File

@ -3,6 +3,14 @@
#ifdef AUDIO_OAL #ifdef AUDIO_OAL
/*
* When linking to a static openal-soft library,
* the extension function inside the openal library conflict with the variables here.
* Therefore declare these re3 owned symbols in a private namespace.
*/
namespace re3_openal {
LPALGENEFFECTS alGenEffects; LPALGENEFFECTS alGenEffects;
LPALDELETEEFFECTS alDeleteEffects; LPALDELETEEFFECTS alDeleteEffects;
LPALISEFFECT alIsEffect; LPALISEFFECT alIsEffect;
@ -37,6 +45,9 @@ LPALGETFILTERIV alGetFilteriv;
LPALGETFILTERF alGetFilterf; LPALGETFILTERF alGetFilterf;
LPALGETFILTERFV alGetFilterfv; LPALGETFILTERFV alGetFilterfv;
}
using namespace re3_openal;
void EFXInit() void EFXInit()
{ {

7
src/audio/oal/oal_utils.h
View File

@ -11,6 +11,8 @@ void EFX_Set(ALuint effect, const EAXLISTENERPROPERTIES *props);
void EAX3_SetReverbMix(ALuint filter, float mix); void EAX3_SetReverbMix(ALuint filter, float mix);
void SetEffectsLevel(ALuint uiFilter, float level); void SetEffectsLevel(ALuint uiFilter, float level);
namespace re3_openal {
extern LPALGENEFFECTS alGenEffects; extern LPALGENEFFECTS alGenEffects;
extern LPALDELETEEFFECTS alDeleteEffects; extern LPALDELETEEFFECTS alDeleteEffects;
extern LPALISEFFECT alIsEffect; extern LPALISEFFECT alIsEffect;
@ -44,4 +46,9 @@ extern LPALGETFILTERI alGetFilteri;
extern LPALGETFILTERIV alGetFilteriv; extern LPALGETFILTERIV alGetFilteriv;
extern LPALGETFILTERF alGetFilterf; extern LPALGETFILTERF alGetFilterf;
extern LPALGETFILTERFV alGetFilterfv; extern LPALGETFILTERFV alGetFilterfv;
}
using namespace re3_openal;
#endif #endif