From 78dc2e6a2e3721d9217b33ccf7ee62603e9161d0 Mon Sep 17 00:00:00 2001 From: thilo Date: Thu, 13 Dec 2007 10:58:43 +0000 Subject: Fix multiple symbol errors for compilation on MacOSX. Remove unnecessary definitions. git-svn-id: svn://svn.icculus.org/quake3/trunk@1234 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/client/qal.c | 76 +++------------------------------------- code/client/qal.h | 102 ------------------------------------------------------ 2 files changed, 5 insertions(+), 173 deletions(-) (limited to 'code') diff --git a/code/client/qal.c b/code/client/qal.c index 66b7f03..457ab3a 100644 --- a/code/client/qal.c +++ b/code/client/qal.c @@ -25,83 +25,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifdef USE_OPENAL +#ifdef USE_OPENAL_DLOPEN +#define AL_NO_PROTOTYPES +#define ALC_NO_PROTOTYPES +#endif + #include "qal.h" #ifdef USE_OPENAL_DLOPEN #include "../sys/sys_loadlib.h" -LPALENABLE qalEnable; -LPALDISABLE qalDisable; -LPALISENABLED qalIsEnabled; -LPALGETSTRING qalGetString; -LPALGETBOOLEANV qalGetBooleanv; -LPALGETINTEGERV qalGetIntegerv; -LPALGETFLOATV qalGetFloatv; -LPALGETDOUBLEV qalGetDoublev; -LPALGETBOOLEAN qalGetBoolean; -LPALGETINTEGER qalGetInteger; -LPALGETFLOAT qalGetFloat; -LPALGETDOUBLE qalGetDouble; -LPALGETERROR qalGetError; -LPALISEXTENSIONPRESENT qalIsExtensionPresent; -LPALGETPROCADDRESS qalGetProcAddress; -LPALGETENUMVALUE qalGetEnumValue; -LPALLISTENERF qalListenerf; -LPALLISTENER3F qalListener3f; -LPALLISTENERFV qalListenerfv; -LPALLISTENERI qalListeneri; -LPALGETLISTENERF qalGetListenerf; -LPALGETLISTENER3F qalGetListener3f; -LPALGETLISTENERFV qalGetListenerfv; -LPALGETLISTENERI qalGetListeneri; -LPALGENSOURCES qalGenSources; -LPALDELETESOURCES qalDeleteSources; -LPALISSOURCE qalIsSource; -LPALSOURCEF qalSourcef; -LPALSOURCE3F qalSource3f; -LPALSOURCEFV qalSourcefv; -LPALSOURCEI qalSourcei; -LPALGETSOURCEF qalGetSourcef; -LPALGETSOURCE3F qalGetSource3f; -LPALGETSOURCEFV qalGetSourcefv; -LPALGETSOURCEI qalGetSourcei; -LPALSOURCEPLAYV qalSourcePlayv; -LPALSOURCESTOPV qalSourceStopv; -LPALSOURCEREWINDV qalSourceRewindv; -LPALSOURCEPAUSEV qalSourcePausev; -LPALSOURCEPLAY qalSourcePlay; -LPALSOURCESTOP qalSourceStop; -LPALSOURCEREWIND qalSourceRewind; -LPALSOURCEPAUSE qalSourcePause; -LPALSOURCEQUEUEBUFFERS qalSourceQueueBuffers; -LPALSOURCEUNQUEUEBUFFERS qalSourceUnqueueBuffers; -LPALGENBUFFERS qalGenBuffers; -LPALDELETEBUFFERS qalDeleteBuffers; -LPALISBUFFER qalIsBuffer; -LPALBUFFERDATA qalBufferData; -LPALGETBUFFERF qalGetBufferf; -LPALGETBUFFERI qalGetBufferi; -LPALDOPPLERFACTOR qalDopplerFactor; -LPALDOPPLERVELOCITY qalDopplerVelocity; -LPALDISTANCEMODEL qalDistanceModel; - -LPALCCREATECONTEXT qalcCreateContext; -LPALCMAKECONTEXTCURRENT qalcMakeContextCurrent; -LPALCPROCESSCONTEXT qalcProcessContext; -LPALCSUSPENDCONTEXT qalcSuspendContext; -LPALCDESTROYCONTEXT qalcDestroyContext; -LPALCGETCURRENTCONTEXT qalcGetCurrentContext; -LPALCGETCONTEXTSDEVICE qalcGetContextsDevice; -LPALCOPENDEVICE qalcOpenDevice; -LPALCCLOSEDEVICE qalcCloseDevice; -LPALCGETERROR qalcGetError; -LPALCISEXTENSIONPRESENT qalcIsExtensionPresent; -LPALCGETPROCADDRESS qalcGetProcAddress; -LPALCGETENUMVALUE qalcGetEnumValue; -LPALCGETSTRING qalcGetString; -LPALCGETINTEGERV qalcGetIntegerv; - static void *OpenALLib = NULL; static qboolean alinit_fail = qfalse; diff --git a/code/client/qal.h b/code/client/qal.h index 1a2284a..fbf3d37 100644 --- a/code/client/qal.h +++ b/code/client/qal.h @@ -28,11 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qcommon.h" -#ifdef USE_OPENAL_DLOPEN -#define AL_NO_PROTOTYPES -#define ALC_NO_PROTOTYPES -#endif - #ifdef USE_LOCAL_HEADERS #include "../AL/al.h" #include "../AL/alc.h" @@ -47,102 +42,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #endif -#ifdef USE_OPENAL_DLOPEN -extern LPALENABLE qalEnable; -extern LPALDISABLE qalDisable; -extern LPALISENABLED qalIsEnabled; -extern LPALGETSTRING qalGetString; -extern LPALGETBOOLEANV qalGetBooleanv; -extern LPALGETINTEGERV qalGetIntegerv; -extern LPALGETFLOATV qalGetFloatv; -extern LPALGETDOUBLEV qalGetDoublev; -extern LPALGETBOOLEAN qalGetBoolean; -extern LPALGETINTEGER qalGetInteger; -extern LPALGETFLOAT qalGetFloat; -extern LPALGETDOUBLE qalGetDouble; -extern LPALGETERROR qalGetError; -extern LPALISEXTENSIONPRESENT qalIsExtensionPresent; -extern LPALGETPROCADDRESS qalGetProcAddress; -extern LPALGETENUMVALUE qalGetEnumValue; -extern LPALLISTENERF qalListenerf; -extern LPALLISTENER3F qalListener3f; -extern LPALLISTENERFV qalListenerfv; -extern LPALLISTENERI qalListeneri; -extern LPALLISTENER3I qalListener3i; -extern LPALLISTENERIV qalListeneriv; -extern LPALGETLISTENERF qalGetListenerf; -extern LPALGETLISTENER3F qalGetListener3f; -extern LPALGETLISTENERFV qalGetListenerfv; -extern LPALGETLISTENERI qalGetListeneri; -extern LPALGETLISTENER3I qalGetListener3i; -extern LPALGETLISTENERIV qalGetListeneriv; -extern LPALGENSOURCES qalGenSources; -extern LPALDELETESOURCES qalDeleteSources; -extern LPALISSOURCE qalIsSource; -extern LPALSOURCEF qalSourcef; -extern LPALSOURCE3F qalSource3f; -extern LPALSOURCEFV qalSourcefv; -extern LPALSOURCEI qalSourcei; -extern LPALSOURCE3I qalSource3i; -extern LPALSOURCEIV qalSourceiv; -extern LPALGETSOURCEF qalGetSourcef; -extern LPALGETSOURCE3F qalGetSource3f; -extern LPALGETSOURCEFV qalGetSourcefv; -extern LPALGETSOURCEI qalGetSourcei; -extern LPALGETSOURCE3I qalGetSource3i; -extern LPALGETSOURCEIV qalGetSourceiv; -extern LPALSOURCEPLAYV qalSourcePlayv; -extern LPALSOURCESTOPV qalSourceStopv; -extern LPALSOURCEREWINDV qalSourceRewindv; -extern LPALSOURCEPAUSEV qalSourcePausev; -extern LPALSOURCEPLAY qalSourcePlay; -extern LPALSOURCESTOP qalSourceStop; -extern LPALSOURCEREWIND qalSourceRewind; -extern LPALSOURCEPAUSE qalSourcePause; -extern LPALSOURCEQUEUEBUFFERS qalSourceQueueBuffers; -extern LPALSOURCEUNQUEUEBUFFERS qalSourceUnqueueBuffers; -extern LPALGENBUFFERS qalGenBuffers; -extern LPALDELETEBUFFERS qalDeleteBuffers; -extern LPALISBUFFER qalIsBuffer; -extern LPALBUFFERDATA qalBufferData; -extern LPALBUFFERF qalBufferf; -extern LPALBUFFER3F qalBuffer3f; -extern LPALBUFFERFV qalBufferfv; -extern LPALBUFFERF qalBufferi; -extern LPALBUFFER3F qalBuffer3i; -extern LPALBUFFERFV qalBufferiv; -extern LPALGETBUFFERF qalGetBufferf; -extern LPALGETBUFFER3F qalGetBuffer3f; -extern LPALGETBUFFERFV qalGetBufferfv; -extern LPALGETBUFFERI qalGetBufferi; -extern LPALGETBUFFER3I qalGetBuffer3i; -extern LPALGETBUFFERIV qalGetBufferiv; -extern LPALDOPPLERFACTOR qalDopplerFactor; -extern LPALDOPPLERVELOCITY qalDopplerVelocity; -extern LPALSPEEDOFSOUND qalSpeedOfSound; -extern LPALDISTANCEMODEL qalDistanceModel; - -extern LPALCCREATECONTEXT qalcCreateContext; -extern LPALCMAKECONTEXTCURRENT qalcMakeContextCurrent; -extern LPALCPROCESSCONTEXT qalcProcessContext; -extern LPALCSUSPENDCONTEXT qalcSuspendContext; -extern LPALCDESTROYCONTEXT qalcDestroyContext; -extern LPALCGETCURRENTCONTEXT qalcGetCurrentContext; -extern LPALCGETCONTEXTSDEVICE qalcGetContextsDevice; -extern LPALCOPENDEVICE qalcOpenDevice; -extern LPALCCLOSEDEVICE qalcCloseDevice; -extern LPALCGETERROR qalcGetError; -extern LPALCISEXTENSIONPRESENT qalcIsExtensionPresent; -extern LPALCGETPROCADDRESS qalcGetProcAddress; -extern LPALCGETENUMVALUE qalcGetEnumValue; -extern LPALCGETSTRING qalcGetString; -extern LPALCGETINTEGERV qalcGetIntegerv; -extern LPALCCAPTUREOPENDEVICE qalcCaptureOpenDevice; -extern LPALCCAPTURECLOSEDEVICE qalcCaptureCloseDevice; -extern LPALCCAPTURESTART qalcCaptureStart; -extern LPALCCAPTURESTOP qalcCaptureStop; -extern LPALCCAPTURESAMPLES qalcCaptureSamples; -#else #define qalEnable alEnable #define qalDisable alDisable #define qalIsEnabled alIsEnabled @@ -237,7 +136,6 @@ extern LPALCCAPTURESAMPLES qalcCaptureSamples; #define qalcCaptureStart alcCaptureStart #define qalcCaptureStop alcCaptureStop #define qalcCaptureSamples alcCaptureSamples -#endif qboolean QAL_Init(const char *libname); void QAL_Shutdown( void ); -- cgit v1.2.3