r527 - trunk

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Jan 26 16:20:47 EST 2006


Author: tma
Date: 2006-01-26 16:20:47 -0500 (Thu, 26 Jan 2006)
New Revision: 527

Modified:
   trunk/Makefile
Log:
* SDL and OpenAL enabled on FreeBSD (patch from espelho)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-01-25 17:57:53 UTC (rev 526)
+++ trunk/Makefile	2006-01-26 21:20:47 UTC (rev 527)
@@ -414,6 +414,21 @@
 
   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 
+  ifeq ($(USE_OPENAL),1)
+    BASE_CFLAGS += -DUSE_OPENAL=1
+    ifeq ($(USE_OPENAL_DLOPEN),1)
+      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN=1
+    endif
+  endif
+
+  ifeq ($(USE_CODEC_VORBIS),1)
+    BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+  endif
+
+  ifeq ($(USE_SDL),1)
+    BASE_CFLAGS += $(shell sdl11-config --cflags) -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1
+  endif
+
   ifeq ($(ARCH),axp)
     CC=gcc
     BASE_CFLAGS += -DNO_VM_COMPILED
@@ -439,9 +454,25 @@
   # don't need -ldl (FreeBSD)
   LDFLAGS=-lm
 
-  CLIENT_LDFLAGS=-L/usr/X11R6/$(LIB) -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
+  CLIENT_LDFLAGS =
 
+  ifeq ($(USE_SDL),1)
+    CLIENT_LDFLAGS += $(shell sdl11-config --libs)
+  else
+    CLIENT_LDFLAGS += -L/usr/X11R6/$(LIB) -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
+  endif
 
+  ifeq ($(USE_OPENAL),1)
+    ifneq ($(USE_OPENAL_DLOPEN),1)
+      CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal
+    endif
+  endif
+
+  ifeq ($(USE_CODEC_VORBIS),1)
+    CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+  endif
+
+
 else # ifeq freebsd
 
 #############################################################################




More information about the quake3-commits mailing list