r353 - in trunk/code: client unix

[DONOTREPLY at icculus.org]

Author: tma
Date: 2005-11-13 17:16:24 -0500 (Sun, 13 Nov 2005)
New Revision: 353

Modified:
   trunk/code/client/qal.c
   trunk/code/client/qal.h
   trunk/code/unix/Makefile
Log:
* Unbreak the MinGW build more...
* Unbreak USE_OPENAL_DLOPEN=1


Modified: trunk/code/client/qal.c
===================================================================
--- trunk/code/client/qal.c	2005-11-13 21:23:16 UTC (rev 352)
+++ trunk/code/client/qal.c	2005-11-13 22:16:24 UTC (rev 353)
@@ -27,7 +27,7 @@
 
 #include "qal.h"
 
-#ifdef USE_OPENAL_DLOPEN
+#if USE_OPENAL_DLOPEN
 #if defined _WIN32
 #include <windows.h>
 #define OBJTYPE HMODULE
@@ -341,7 +341,7 @@
 	qalcGetString = NULL;
 	qalcGetIntegerv = NULL;
 }
-#endif
+#else
 qboolean QAL_Init(const char *libname)
 {
 	return qtrue;
@@ -350,3 +350,4 @@
 {
 }
 #endif
+#endif

Modified: trunk/code/client/qal.h
===================================================================
--- trunk/code/client/qal.h	2005-11-13 21:23:16 UTC (rev 352)
+++ trunk/code/client/qal.h	2005-11-13 22:16:24 UTC (rev 353)
@@ -28,14 +28,14 @@
 #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;

Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2005-11-13 21:23:16 UTC (rev 352)
+++ trunk/code/unix/Makefile	2005-11-13 22:16:24 UTC (rev 353)
@@ -234,7 +234,7 @@
   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