Apply some fixes for the Linux build.
diff --git a/src/engine/soundSystemAL/qal.cpp b/src/engine/soundSystemAL/qal.cpp
index 94741a0..df44b28 100644
--- a/src/engine/soundSystemAL/qal.cpp
+++ b/src/engine/soundSystemAL/qal.cpp
@@ -162,88 +162,88 @@ bool QAL_Init( pointer libname )
if( ( OpenALLib = SDL_LoadObject( fn ) ) == 0 )
{
trap_Printf( PRINT_ALL, " Can't load %s\n", libname );
- return qfalse;
+ return false;
}
#endif
}
alinit_fail = false;
- qalEnable = static_cast<LPALENABLE>( GPA( "alEnable" ) );
- qalDisable = static_cast<LPALDISABLE>( GPA( "alDisable" ) );
- qalIsEnabled = static_cast<LPALISENABLED>( GPA( "alIsEnabled" ) );
- qalGetString = static_cast<LPALGETSTRING>( GPA( "alGetString" ) );
- qalGetBooleanv = static_cast<LPALGETBOOLEANV>( GPA( "alGetBooleanv" ) );
- qalGetIntegerv = static_cast<LPALGETINTEGERV>( GPA( "alGetIntegerv" ) );
- qalGetFloatv = static_cast<LPALGETFLOATV>( GPA( "alGetFloatv" ) );
- qalGetDoublev = static_cast<LPALGETDOUBLEV>( GPA( "alGetDoublev" ) );
- qalGetBoolean = static_cast<LPALGETBOOLEAN>( GPA( "alGetBoolean" ) );
- qalGetInteger = static_cast<LPALGETINTEGER>( GPA( "alGetInteger" ) );
- qalGetFloat = static_cast<LPALGETFLOAT>( GPA( "alGetFloat" ) );
- qalGetDouble = static_cast<LPALGETDOUBLE>( GPA( "alGetDouble" ) );
- qalGetError = static_cast<LPALGETERROR>( GPA( "alGetError" ) );
- qalIsExtensionPresent = static_cast<LPALISEXTENSIONPRESENT>( GPA( "alIsExtensionPresent" ) );
- qalGetProcAddress = static_cast<LPALGETPROCADDRESS>( GPA( "alGetProcAddress" ) );
- qalGetEnumValue = static_cast<LPALGETENUMVALUE>( GPA( "alGetEnumValue" ) );
- qalListenerf = static_cast<LPALLISTENERF>( GPA( "alListenerf" ) );
- qalListener3f = static_cast<LPALLISTENER3F>( GPA( "alListener3f" ) );
- qalListenerfv = static_cast<LPALLISTENERFV>( GPA( "alListenerfv" ) );
- qalListeneri = static_cast<LPALLISTENERI>( GPA( "alListeneri" ) );
- qalGetListenerf = static_cast<LPALGETLISTENERF>( GPA( "alGetListenerf" ) );
- qalGetListener3f = static_cast<LPALGETLISTENER3F>( GPA( "alGetListener3f" ) );
- qalGetListenerfv = static_cast<LPALGETLISTENERFV>( GPA( "alGetListenerfv" ) );
- qalGetListeneri = static_cast<LPALGETLISTENERI>( GPA( "alGetListeneri" ) );
- qalGenSources = static_cast<LPALGENSOURCES>( GPA( "alGenSources" ) );
- qalDeleteSources = static_cast<LPALDELETESOURCES>( GPA( "alDeleteSources" ) );
- qalIsSource = static_cast<LPALISSOURCE>( GPA( "alIsSource" ) );
- qalSourcef = static_cast<LPALSOURCEF>( GPA( "alSourcef" ) );
- qalSource3f = static_cast<LPALSOURCE3F>( GPA( "alSource3f" ) );
- qalSourcefv = static_cast<LPALSOURCEFV>( GPA( "alSourcefv" ) );
- qalSourcei = static_cast<LPALSOURCEI>( GPA( "alSourcei" ) );
- qalGetSourcef = static_cast<LPALGETSOURCEF>( GPA( "alGetSourcef" ) );
- qalGetSource3f = static_cast<LPALGETSOURCE3F>( GPA( "alGetSource3f" ) );
- qalGetSourcefv = static_cast<LPALGETSOURCEFV>( GPA( "alGetSourcefv" ) );
- qalGetSourcei = static_cast<LPALGETSOURCEI>( GPA( "alGetSourcei" ) );
- qalSourcePlayv = static_cast<LPALSOURCEPLAYV>( GPA( "alSourcePlayv" ) );
- qalSourceStopv = static_cast<LPALSOURCESTOPV>( GPA( "alSourceStopv" ) );
- qalSourceRewindv = static_cast<LPALSOURCEREWINDV>( GPA( "alSourceRewindv" ) );
- qalSourcePausev = static_cast<LPALSOURCEPAUSEV>( GPA( "alSourcePausev" ) );
- qalSourcePlay = static_cast<LPALSOURCEPLAY>( GPA( "alSourcePlay" ) );
- qalSourceStop = static_cast<LPALSOURCESTOP>( GPA( "alSourceStop" ) );
- qalSourceRewind = static_cast<LPALSOURCEREWIND>( GPA( "alSourceRewind" ) );
- qalSourcePause = static_cast<LPALSOURCEPAUSE>( GPA( "alSourcePause" ) );
- qalSourceQueueBuffers = static_cast<LPALSOURCEQUEUEBUFFERS>( GPA( "alSourceQueueBuffers" ) );
- qalSourceUnqueueBuffers = static_cast<LPALSOURCEUNQUEUEBUFFERS>( GPA( "alSourceUnqueueBuffers" ) );
- qalGenBuffers = static_cast<LPALGENBUFFERS>( GPA( "alGenBuffers" ) );
- qalDeleteBuffers = static_cast<LPALDELETEBUFFERS>( GPA( "alDeleteBuffers" ) );
- qalIsBuffer = static_cast<LPALISBUFFER>( GPA( "alIsBuffer" ) );
- qalBufferData = static_cast<LPALBUFFERDATA>( GPA( "alBufferData" ) );
- qalGetBufferf = static_cast<LPALGETBUFFERF>( GPA( "alGetBufferf" ) );
- qalGetBufferi = static_cast<LPALGETBUFFERI>( GPA( "alGetBufferi" ) );
- qalDopplerFactor = static_cast<LPALDOPPLERFACTOR>( GPA( "alDopplerFactor" ) );
- qalDopplerVelocity = static_cast<LPALDOPPLERVELOCITY>( GPA( "alDopplerVelocity" ) );
- qalDistanceModel = static_cast<LPALDISABLE>( GPA( "alDistanceModel" ) );
+ qalEnable = reinterpret_cast<LPALENABLE>( GPA( "alEnable" ) );
+ qalDisable = reinterpret_cast<LPALDISABLE>( GPA( "alDisable" ) );
+ qalIsEnabled = reinterpret_cast<LPALISENABLED>( GPA( "alIsEnabled" ) );
+ qalGetString = reinterpret_cast<LPALGETSTRING>( GPA( "alGetString" ) );
+ qalGetBooleanv = reinterpret_cast<LPALGETBOOLEANV>( GPA( "alGetBooleanv" ) );
+ qalGetIntegerv = reinterpret_cast<LPALGETINTEGERV>( GPA( "alGetIntegerv" ) );
+ qalGetFloatv = reinterpret_cast<LPALGETFLOATV>( GPA( "alGetFloatv" ) );
+ qalGetDoublev = reinterpret_cast<LPALGETDOUBLEV>( GPA( "alGetDoublev" ) );
+ qalGetBoolean = reinterpret_cast<LPALGETBOOLEAN>( GPA( "alGetBoolean" ) );
+ qalGetInteger = reinterpret_cast<LPALGETINTEGER>( GPA( "alGetInteger" ) );
+ qalGetFloat = reinterpret_cast<LPALGETFLOAT>( GPA( "alGetFloat" ) );
+ qalGetDouble = reinterpret_cast<LPALGETDOUBLE>( GPA( "alGetDouble" ) );
+ qalGetError = reinterpret_cast<LPALGETERROR>( GPA( "alGetError" ) );
+ qalIsExtensionPresent = reinterpret_cast<LPALISEXTENSIONPRESENT>( GPA( "alIsExtensionPresent" ) );
+ qalGetProcAddress = reinterpret_cast<LPALGETPROCADDRESS>( GPA( "alGetProcAddress" ) );
+ qalGetEnumValue = reinterpret_cast<LPALGETENUMVALUE>( GPA( "alGetEnumValue" ) );
+ qalListenerf = reinterpret_cast<LPALLISTENERF>( GPA( "alListenerf" ) );
+ qalListener3f = reinterpret_cast<LPALLISTENER3F>( GPA( "alListener3f" ) );
+ qalListenerfv = reinterpret_cast<LPALLISTENERFV>( GPA( "alListenerfv" ) );
+ qalListeneri = reinterpret_cast<LPALLISTENERI>( GPA( "alListeneri" ) );
+ qalGetListenerf = reinterpret_cast<LPALGETLISTENERF>( GPA( "alGetListenerf" ) );
+ qalGetListener3f = reinterpret_cast<LPALGETLISTENER3F>( GPA( "alGetListener3f" ) );
+ qalGetListenerfv = reinterpret_cast<LPALGETLISTENERFV>( GPA( "alGetListenerfv" ) );
+ qalGetListeneri = reinterpret_cast<LPALGETLISTENERI>( GPA( "alGetListeneri" ) );
+ qalGenSources = reinterpret_cast<LPALGENSOURCES>( GPA( "alGenSources" ) );
+ qalDeleteSources = reinterpret_cast<LPALDELETESOURCES>( GPA( "alDeleteSources" ) );
+ qalIsSource = reinterpret_cast<LPALISSOURCE>( GPA( "alIsSource" ) );
+ qalSourcef = reinterpret_cast<LPALSOURCEF>( GPA( "alSourcef" ) );
+ qalSource3f = reinterpret_cast<LPALSOURCE3F>( GPA( "alSource3f" ) );
+ qalSourcefv = reinterpret_cast<LPALSOURCEFV>( GPA( "alSourcefv" ) );
+ qalSourcei = reinterpret_cast<LPALSOURCEI>( GPA( "alSourcei" ) );
+ qalGetSourcef = reinterpret_cast<LPALGETSOURCEF>( GPA( "alGetSourcef" ) );
+ qalGetSource3f = reinterpret_cast<LPALGETSOURCE3F>( GPA( "alGetSource3f" ) );
+ qalGetSourcefv = reinterpret_cast<LPALGETSOURCEFV>( GPA( "alGetSourcefv" ) );
+ qalGetSourcei = reinterpret_cast<LPALGETSOURCEI>( GPA( "alGetSourcei" ) );
+ qalSourcePlayv = reinterpret_cast<LPALSOURCEPLAYV>( GPA( "alSourcePlayv" ) );
+ qalSourceStopv = reinterpret_cast<LPALSOURCESTOPV>( GPA( "alSourceStopv" ) );
+ qalSourceRewindv = reinterpret_cast<LPALSOURCEREWINDV>( GPA( "alSourceRewindv" ) );
+ qalSourcePausev = reinterpret_cast<LPALSOURCEPAUSEV>( GPA( "alSourcePausev" ) );
+ qalSourcePlay = reinterpret_cast<LPALSOURCEPLAY>( GPA( "alSourcePlay" ) );
+ qalSourceStop = reinterpret_cast<LPALSOURCESTOP>( GPA( "alSourceStop" ) );
[... diff too long, it was truncated ...]
GitHub
sha: 35ebac11