* Unbreak the MinGW build more...

* Unbreak USE_OPENAL_DLOPEN=1
ioquake · Nov 13, 2005 · 668fdc1 · 668fdc1
1 parent 33c1528
commit 668fdc1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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