diff options
author | Anonymous Maarten <anonymous.maarten@gmail.com> | 2020-12-06 23:22:02 +0100 |
---|---|---|
committer | Anonymous Maarten <anonymous.maarten@gmail.com> | 2020-12-07 19:05:58 +0100 |
commit | 5a1ea7bcf579b616e349ed651c67e0f988592cbd (patch) | |
tree | 96dfa7ea960587cb5098d21c76c932194070465d /src/audio/oal/oal_utils.cpp | |
parent | Fixing the Ghost vehicle name. (diff) | |
download | re3-5a1ea7bcf579b616e349ed651c67e0f988592cbd.tar re3-5a1ea7bcf579b616e349ed651c67e0f988592cbd.tar.gz re3-5a1ea7bcf579b616e349ed651c67e0f988592cbd.tar.bz2 re3-5a1ea7bcf579b616e349ed651c67e0f988592cbd.tar.lz re3-5a1ea7bcf579b616e349ed651c67e0f988592cbd.tar.xz re3-5a1ea7bcf579b616e349ed651c67e0f988592cbd.tar.zst re3-5a1ea7bcf579b616e349ed651c67e0f988592cbd.zip |
Diffstat (limited to '')
-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() { |