From dfff1857ce0517dec0c67c59eed9bab0a4d55e25 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 27 Jan 2006 19:50:12 +0000 Subject: * Merged ioq3-r529 - Quick fullscreen changes - Fix to that server crashing memory leak - Some FreeBSD changes * Default for r_znear changed --- Makefile | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d587243a..ca44dd6b 100644 --- a/Makefile +++ b/Makefile @@ -415,6 +415,21 @@ ifeq ($(PLATFORM),freebsd) 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 @@ -440,7 +455,24 @@ ifeq ($(PLATFORM),freebsd) # 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 -- cgit