diff options
author | Nikolay <nickvnuk@gmail.com> | 2020-12-19 17:15:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-19 17:15:52 +0100 |
commit | 867133e93d57dba5319bb13abeeb3f73bbaf6ae1 (patch) | |
tree | e16891b3bd62f38bc959c295ebeca1aa6b9952d7 /src/audio/oal/oal_utils.cpp | |
parent | silly mistake (diff) | |
parent | fixed cmakelists (diff) | |
download | re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.gz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.bz2 re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.lz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.xz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.zst re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.zip |
Diffstat (limited to 'src/audio/oal/oal_utils.cpp')
-rw-r--r-- | src/audio/oal/oal_utils.cpp | 11 |
1 files changed, 11 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() { |