summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshfil <filip.gawin@zoho.com>2020-12-08 16:40:57 +0100
committerGitHub <noreply@github.com>2020-12-08 16:40:57 +0100
commit95094e45af22c6667983b94180e29e05f9a71424 (patch)
treeb50b879e9fcb77fb26aa4066077b07b5b2aa1945
parentAdd NUM_LEVELS (diff)
parentaudio: define openal extensions in re3 owned namespace (diff)
downloadre3-95094e45af22c6667983b94180e29e05f9a71424.tar
re3-95094e45af22c6667983b94180e29e05f9a71424.tar.gz
re3-95094e45af22c6667983b94180e29e05f9a71424.tar.bz2
re3-95094e45af22c6667983b94180e29e05f9a71424.tar.lz
re3-95094e45af22c6667983b94180e29e05f9a71424.tar.xz
re3-95094e45af22c6667983b94180e29e05f9a71424.tar.zst
re3-95094e45af22c6667983b94180e29e05f9a71424.zip
Diffstat (limited to '')
-rw-r--r--src/audio/oal/oal_utils.cpp11
-rw-r--r--src/audio/oal/oal_utils.h7
2 files changed, 18 insertions, 0 deletions
diff --git a/src/audio/oal/oal_utils.cpp b/src/audio/oal/oal_utils.cpp
index e16de572..e4cb0b77 100644
--- a/src/audio/oal/oal_utils.cpp
+++ b/src/audio/oal/oal_utils.cpp
@@ -3,6 +3,14 @@
#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;
LPALDELETEEFFECTS alDeleteEffects;
LPALISEFFECT alIsEffect;
@@ -37,6 +45,9 @@ LPALGETFILTERIV alGetFilteriv;
LPALGETFILTERF alGetFilterf;
LPALGETFILTERFV alGetFilterfv;
+}
+
+using namespace re3_openal;
void EFXInit()
{
diff --git a/src/audio/oal/oal_utils.h b/src/audio/oal/oal_utils.h
index b89ccf36..f0fa090a 100644
--- a/src/audio/oal/oal_utils.h
+++ b/src/audio/oal/oal_utils.h
@@ -11,6 +11,8 @@ void EFX_Set(ALuint effect, const EAXLISTENERPROPERTIES *props);
void EAX3_SetReverbMix(ALuint filter, float mix);
void SetEffectsLevel(ALuint uiFilter, float level);
+namespace re3_openal {
+
extern LPALGENEFFECTS alGenEffects;
extern LPALDELETEEFFECTS alDeleteEffects;
extern LPALISEFFECT alIsEffect;
@@ -44,4 +46,9 @@ extern LPALGETFILTERI alGetFilteri;
extern LPALGETFILTERIV alGetFilteriv;
extern LPALGETFILTERF alGetFilterf;
extern LPALGETFILTERFV alGetFilterfv;
+
+}
+
+using namespace re3_openal;
+
#endif