diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-13 22:16:24 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-13 22:16:24 +0000 |
| commit | 633090cac5b7ca6897f5bb1dba3c76c8d285c0e1 (patch) | |
| tree | fe1e0eab89c52eebfc1e1f0c754f73d2475189ce | |
| parent | 135df57c39145136779617008cea32e88872bee9 (diff) | |
| download | ioquake3-aero-633090cac5b7ca6897f5bb1dba3c76c8d285c0e1.tar.gz ioquake3-aero-633090cac5b7ca6897f5bb1dba3c76c8d285c0e1.zip | |
* Unbreak the MinGW build more...
* Unbreak USE_OPENAL_DLOPEN=1
git-svn-id: svn://svn.icculus.org/quake3/trunk@353 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/client/qal.c | 5 | ||||
| -rw-r--r-- | code/client/qal.h | 4 | ||||
| -rw-r--r-- | code/unix/Makefile | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/code/client/qal.c b/code/client/qal.c index a958e7c..7594185 100644 --- a/code/client/qal.c +++ b/code/client/qal.c @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "qal.h" -#ifdef USE_OPENAL_DLOPEN +#if USE_OPENAL_DLOPEN #if defined _WIN32 #include <windows.h> #define OBJTYPE HMODULE @@ -341,7 +341,7 @@ void QAL_Shutdown( void ) qalcGetString = NULL; qalcGetIntegerv = NULL; } -#endif +#else qboolean QAL_Init(const char *libname) { return qtrue; @@ -350,3 +350,4 @@ void QAL_Shutdown( void ) { } #endif +#endif diff --git a/code/client/qal.h b/code/client/qal.h index 6760c24..1d71179 100644 --- a/code/client/qal.h +++ b/code/client/qal.h @@ -28,14 +28,14 @@ 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 +#if USE_OPENAL_DLOPEN #define AL_NO_PROTOTYPES #define ALC_NO_PROTOTYPES #endif #include <AL/al.h> #include <AL/alc.h> -#ifdef USE_OPENAL_DLOPEN +#if USE_OPENAL_DLOPEN extern LPALENABLE qalEnable; extern LPALDISABLE qalDisable; extern LPALISENABLED qalIsEnabled; diff --git a/code/unix/Makefile b/code/unix/Makefile index 47a0a79..d315968 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -234,7 +234,7 @@ ifeq ($(PLATFORM),mingw32) BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL=1 + BASE_CFLAGS += -DUSE_OPENAL=1 -DUSE_OPENAL_DLOPEN=1 endif DX_CFLAGS = -I$(DXSDK_DIR)/Include |