diff options
| author | Tim Angus <tim@ngus.net> | 2006-01-27 19:50:12 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-01-27 19:50:12 +0000 |
| commit | dfff1857ce0517dec0c67c59eed9bab0a4d55e25 (patch) | |
| tree | 10d227310c61eb1fc6e0cddbd8bb9ec847918cb6 /Makefile | |
| parent | c106cea01560ffc77938d6cb3d9239250828c8d5 (diff) | |
* Merged ioq3-r529
- Quick fullscreen changes
- Fix to that server crashing memory leak
- Some FreeBSD changes
* Default for r_znear changed
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 34 |
1 files changed, 33 insertions, 1 deletions
@@ -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 |