diff options
Diffstat (limited to 'code/unix/Makefile')
| -rw-r--r-- | code/unix/Makefile | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile index 925cf07..0a1737d 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -87,6 +87,8 @@ RPM_RELEASE=1 ## Defaults DLL_ONLY=false +USE_SDL=true + # bk010215 - TODO - add all defaults / kill Ryan @@ -118,6 +120,11 @@ ifeq ($(PLATFORM),linux) BASE_CFLAGS += -DDLL_ONLY endif + # !!! FIXME: make this a build option? Make it coexist with X11 glimp? + ifeq ($(strip $(USE_SDL)),true) + BASE_CFLAGS += -DUSE_SDL=1 -ISDL12/include + endif + GL_CFAGS = -I/usr/X11R6/include # bk001204 - need -O for -Wall for uninitialized @@ -164,6 +171,10 @@ ifeq ($(PLATFORM),linux) LDFLAGS += $(shell pkg-config --libs freetype2) endif + ifeq ($(strip $(USE_SDL)),true) + LDFLAGS+=-lSDL + endif + ifeq ($(ARCH),i386) # linux32 make ... BASE_CFLAGS += -m32 @@ -176,7 +187,6 @@ ifeq ($(PLATFORM),linux) else TARGETS=\ $(B)/$(PLATFORM)quake3 \ - $(B)/$(PLATFORM)quake3-smp \ $(B)/$(PLATFORM)q3ded \ $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \ $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \ @@ -190,6 +200,8 @@ ifeq ($(PLATFORM),linux) # $(B)/missionpack/vm/qagame.qvm \ # $(B)/missionpack/vm/cgame.qvm \ # $(B)/missionpack/vm/ui.qvm +# $(B)/$(PLATFORM)quake3-smp \ + endif ## $(B)/$(PLATFORM)q3static \ @@ -540,6 +552,7 @@ ifeq ($(PLATFORM),freebsd) $(B)/client/linux_signals.o \ $(B)/client/linux_common.o \ $(B)/client/linux_qgl.o \ + $(B)/client/linux_glimp_sdl.o \ $(B)/client/linux_glimp.o \ $(B)/client/linux_snd.o \ $(B)/client/snd_mixa.o \ @@ -562,6 +575,7 @@ else $(B)/client/linux_common.o \ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp.o \ + $(B)/client/linux_glimp_sdl.o \ $(B)/client/linux_joystick.o \ $(B)/client/linux_snd.o \ $(B)/client/snd_mixa.o \ @@ -739,6 +753,7 @@ $(B)/client/irix_input.o : $(UDIR)/irix_input.c; $(DO_CC) $(B)/client/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_CC) $(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC) $(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS) +$(B)/client/linux_glimp_sdl.o : $(UDIR)/linux_glimp_sdl.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS) $(B)/client/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) $(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS) @@ -1548,6 +1563,7 @@ Q3SOBJ = \ $(B)/q3static/unix_shared.o \ \ $(B)/q3static/linux_qgl.o \ + $(B)/q3static/linux_glimp_sdl.o \ $(B)/q3static/linux_glimp.o \ $(B)/q3static/linux_joystick.o \ $(B)/q3static/linux_snd.o \ @@ -1702,6 +1718,7 @@ $(B)/q3static/unix_qgl.o : $(UDIR)/unix_qgl.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/unix_main.o : $(UDIR)/unix_main.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC +$(B)/q3static/linux_glimp_sdl.o : $(UDIR)/linux_glimp_sdl.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC |