From 19c5b582bc1d4b3d7035218937dff160aaa37d23 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Wed, 6 Oct 2021 00:07:54 +0300 Subject: [PATCH] Fix linking with static OpenAL under windows --- nel/src/sound/driver/openal/ext_al.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nel/src/sound/driver/openal/ext_al.cpp b/nel/src/sound/driver/openal/ext_al.cpp index e6a090e80..6edeb9552 100644 --- a/nel/src/sound/driver/openal/ext_al.cpp +++ b/nel/src/sound/driver/openal/ext_al.cpp @@ -66,6 +66,7 @@ void alExtInitDevice(ALCdevice *device) } } +#if !defined(AL_LIBTYPE_STATIC) // Windows and Mac OS always link to shared OpenAL library #if defined(NL_OS_WINDOWS) || defined(NL_OS_MAC) || !defined(NL_STATIC) // EFX @@ -114,6 +115,7 @@ void alExtInitDevice(ALCdevice *device) } } #endif +#endif } #if EAX_AVAILABLE @@ -137,6 +139,7 @@ EAXGetBufferMode eaxGetBufferMode = NULL; // ALC_EXT_EFX bool AlExtEfx = false; // effect objects +#if !defined(AL_LIBTYPE_STATIC) #if defined(NL_OS_WINDOWS) || defined(NL_OS_MAC) || !defined(NL_STATIC) LPALGENEFXOBJECTS alGenEffects = NULL; LPALDELETEEFXOBJECTS alDeleteEffects = NULL; @@ -174,6 +177,7 @@ LPALGETEFXOBJECTIV alGetAuxiliaryEffectSlotiv = NULL; LPALGETEFXOBJECTF alGetAuxiliaryEffectSlotf = NULL; LPALGETEFXOBJECTFV alGetAuxiliaryEffectSlotfv = NULL; #endif +#endif } /* end of file */