diff options
Diffstat (limited to 'games/quake2lnx/files/patch-Makefile')
| -rw-r--r-- | games/quake2lnx/files/patch-Makefile | 428 |
1 files changed, 428 insertions, 0 deletions
diff --git a/games/quake2lnx/files/patch-Makefile b/games/quake2lnx/files/patch-Makefile new file mode 100644 index 000000000000..d7d30abd19f8 --- /dev/null +++ b/games/quake2lnx/files/patch-Makefile @@ -0,0 +1,428 @@ +--- Makefile.orig Thu Oct 10 01:08:21 2002 ++++ Makefile Tue Jun 17 22:23:11 2003 +@@ -12,28 +12,28 @@ + # (Note: not all options are available for all platforms). + # quake2 (uses OSS for sound, cdrom ioctls for cd audio) is automatically built. + # game$(ARCH).so is automatically built. +-BUILD_SDLQUAKE2=YES # sdlquake2 executable (uses SDL for cdrom and sound) +-BUILD_SVGA=NO # SVGAlib driver. Seems to work fine. +-BUILD_X11=YES # X11 software driver. Works somewhat ok. +-BUILD_GLX=YES # X11 GLX driver. Works somewhat ok. +-BUILD_FXGL=NO # FXMesa driver. Not tested. (used only for V1 and V2). +-BUILD_SDL=YES # SDL software driver. Works fine for some people. +-BUILD_SDLGL=YES # SDL OpenGL driver. Works fine for some people. +-BUILD_CTFDLL=YES # game$(ARCH).so for ctf +-BUILD_XATRIX=NO # game$(ARCH).so for xatrix (see README.r for details) +-BUILD_ROGUE=NO # game$(ARCH).so for rogue (see README.r for details) +-BUILD_JOYSTICK=YES # build in joystick support +-BUILD_ARTS=NO # build in support for libaRts sound. +-BUILD_DEDICATED=NO # build a dedicated quake2 server +-BUILD_AA=YES # build the ascii soft renderer. +-BUILD_QMAX=YES # build the fancier GL graphics ++#BUILD_SDLQUAKE2=YES # sdlquake2 executable (uses SDL for cdrom and sound) ++#BUILD_SVGA=NO # SVGAlib driver. Seems to work fine. ++#BUILD_X11=YES # X11 software driver. Works somewhat ok. ++#BUILD_GLX=YES # X11 GLX driver. Works somewhat ok. ++#BUILD_FXGL=NO # FXMesa driver. Not tested. (used only for V1 and V2). ++#BUILD_SDL=YES # SDL software driver. Works fine for some people. ++#BUILD_SDLGL=YES # SDL OpenGL driver. Works fine for some people. ++#BUILD_CTFDLL=YES # game$(ARCH).so for ctf ++#BUILD_XATRIX=NO # game$(ARCH).so for xatrix (see README.r for details) ++#BUILD_ROGUE=NO # game$(ARCH).so for rogue (see README.r for details) ++#BUILD_JOYSTICK=YES # build in joystick support ++#BUILD_ARTS=NO # build in support for libaRts sound. ++#BUILD_DEDICATED=NO # build a dedicated quake2 server ++#BUILD_AA=YES # build the ascii soft renderer. ++#BUILD_QMAX=YES # build the fancier GL graphics + + STATICSDL=NO +-SDLDIR=/usr/local/lib ++SDLDIR=${PREFIX}/lib + + # Other compile-time options: + # Compile with IPv6 (protocol independent API). Tested on FreeBSD +-HAVE_IPV6=NO ++#HAVE_IPV6=NO + + # (hopefully) end of configurable options + +@@ -50,47 +50,11 @@ + endif + endif + ++CC?=gcc + +-# this nice line comes from the linux kernel makefile +-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/) ++RELEASE_CFLAGS= $(BASE_CFLAGS) $(OPTIMIZED_CFLAGS) + +-ifneq ($(ARCH),i386) +-ifneq ($(ARCH),axp) +-ifneq ($(ARCH),ppc) +-ifneq ($(ARCH),sparc) +-$(error arch $(ARCH) is currently not supported) +-endif +-endif +-endif +-endif +- +-CC=gcc +- +-ifeq ($(ARCH),axp) +-RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \ +- -fomit-frame-pointer -fexpensive-optimizations +-endif +- +-ifeq ($(ARCH),ppc) +-RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \ +- -fomit-frame-pointer -fexpensive-optimizations +-endif +- +-ifeq ($(ARCH),sparc) +-RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \ +- -fomit-frame-pointer -fexpensive-optimizations +-endif +- +-ifeq ($(ARCH),i386) +-RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -malign-loops=2 \ +- -malign-jumps=2 -malign-functions=2 -g +-# compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts. +-#RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \ +-# -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ +-# -malign-jumps=2 -malign-functions=2 +-endif +- +-VERSION=3.21+rCVS ++VERSION=3.21+r0.15 + + MOUNT_DIR=src + +@@ -108,7 +72,7 @@ + ROGUE_DIR=$(MOUNT_DIR)/rogue + NULL_DIR=$(MOUNT_DIR)/null + +-BASE_CFLAGS=-Wall -pipe -Dstricmp=strcasecmp ++BASE_CFLAGS=-Wall -pipe -Dstricmp=strcasecmp $(CFLAGS) + ifeq ($(HAVE_IPV6),YES) + BASE_CFLAGS+= -DHAVE_IPV6 -DHAVE_SIN6_LEN + NET_UDP=net_udp6 +@@ -127,7 +91,13 @@ + BASE_CFLAGS+=$(shell artsc-config --cflags) + endif + +-ifneq ($(ARCH),i386) ++ifeq ($(ARCH),i386) ++ifneq ($(strip $(NO_X86_ASM)),YES) ++ BASE_CFLAGS+=-Did386 ++else ++ BASE_CFLAGS+=-DC_ONLY ++endif ++else + BASE_CFLAGS+=-DC_ONLY + endif + +@@ -144,20 +114,22 @@ + LDFLAGS+=$(shell artsc-config --libs) + endif + +-SVGALDFLAGS=-lvga ++SVGALDFLAGS=-L${PREFIX}/lib -lvga ++SVGACFLAGS=-I${PREFIX}/include + +-XCFLAGS=-I/usr/X11R6/include +-XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm +-AALDFLAGS=-lm -laa ++XCFLAGS=-I${X11BASE}/include ++XLDFLAGS=-L${X11BASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm ++AACFLAGS=-I${PREFIX}/include ++AALDFLAGS=-L${PREFIX}/lib -laa + +-SDLCFLAGS=$(shell sdl-config --cflags) ++SDLCFLAGS=$(shell sdl11-config --cflags) + ifeq ($(strip $(STATICSDL)),YES) +- SDLLDFLAGS += -L/usr/X11R6/lib -Wl,-Bstatic $(SDLDIR)/libSDL.a ++ SDLLDFLAGS += -L${X11BASE}/lib -Wl,-Bstatic $(SDLDIR)/libSDL.a + SDLLDFLAGS += $(SDLDIR)/libesd.a $(SDLDIR)/libartsc.a -Wl,-Bdynamic + SDLLDFLAGS += -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm -lXv \ + -lXinerama + else +- SDLLDFLAGS=$(shell sdl-config --libs) ++ SDLLDFLAGS=$(shell sdl11-config --libs) + endif + + ifeq ($(strip $(BUILD_JOYSTICK)),YES) +@@ -168,15 +140,16 @@ + FXGLLDFLAGS=-L/usr/local/glide/lib -L/usr/X11/lib -L/usr/local/lib \ + -L/usr/X11R6/lib -lX11 -lXext -lGL -lvga + +-GLXCFLAGS=-I/usr/X11R6/include -DOPENGL +-GLXLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm ++GLXCFLAGS=-I${X11BASE}/include -DOPENGL ++GLXLDFLAGS=-L${X11BASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm + + SDLGLCFLAGS=$(SDLCFLAGS) -DOPENGL + SDLGLLDFLAGS=$(SDLLDFLAGS) + + ifeq ($(strip $(BUILD_QMAX)),YES) +-GLXLDFLAGS+=-ljpeg +-SDLGLLDFLAGS+=-ljpeg ++GLXCFLAGS+=-I${PREFIX}/include ++GLXLDFLAGS+=-L${PREFIX}/lib -ljpeg ++SDLGLLDFLAGS+=-L${PREFIX}/lib -ljpeg + REF_GL_DIR = $(MOUNT_DIR)/ref_candygl + CL_FX = cl_fxmax.c + else +@@ -192,7 +165,7 @@ + DO_DED_CC=$(CC) $(CFLAGS) -DDEDICATED_ONLY -o $@ -c $< + DO_DED_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -DDEDICATED_ONLY -o $@ -c $< + DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< +-DO_GL_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) $(GLCFLAGS) -o $@ -c $< ++DO_GL_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) $(GLCFLAGS) $(GLXCFLAGS) -o $@ -c $< + DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< + DO_SHLIB_AS=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< + +@@ -202,10 +175,42 @@ + + .PHONY : targets build_debug build_release clean clean-debug clean-release clean2 + +-TARGETS=$(BUILDDIR)/quake2 $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) ++ifeq ($(strip $(BUILD_CLIENT)),YES) ++ TARGETS += $(BUILDDIR)/quake2 ++endif ++ ++ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) ++ TARGETS += $(BUILDDIR)/sdlquake2 ++endif ++ ++ifeq ($(strip $(BUILD_SVGA)),YES) ++ TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT) ++endif ++ ++ifeq ($(strip $(BUILD_X11)),YES) ++ TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT) ++endif ++ ++ifeq ($(strip $(BUILD_GLX)),YES) ++ TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT) ++endif ++ ++ifeq ($(strip $(BUILD_SDL)),YES) ++ TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT) ++endif ++ ++ifeq ($(strip $(BUILD_SDLGL)),YES) ++ TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT) ++endif ++ + ifeq ($(strip $(BUILD_DEDICATED)),YES) + TARGETS += $(BUILDDIR)/q2ded + endif ++ ++ifeq ($(strip $(BUILD_GAME)),YES) ++ TARGETS += $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) ++endif ++ + ifeq ($(strip $(BUILD_CTFDLL)),YES) + TARGETS += $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) + endif +@@ -218,126 +223,6 @@ + TARGETS += $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) + endif + +-ifeq ($(ARCH),axp) +- ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) +- $(warning Warning: SDLQuake2 not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_SVGA)),YES) +- $(warning Warning: SVGAlib support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_X11)),YES) +- $(warning Warning: X11 support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_GLX)),YES) +- $(warning Warning: support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_FXGL)),YES) +- $(warning Warning: FXGL support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_SDL)),YES) +- $(warning Warning: SDL support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_SDLGL)),YES) +- $(warning Warning: SDLGL support not supported for $(ARCH)) +- endif +-endif # ARCH axp +- +-ifeq ($(ARCH),ppc) +- ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) +- TARGETS += $(BUILDDIR)/sdlquake2 +- endif +- +- ifeq ($(strip $(BUILD_SVGA)),YES) +- $(warning Warning: SVGAlib support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_X11)),YES) +- TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_GLX)),YES) +- TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_FXGL)),YES) +- $(warning Warning: FXGL support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_SDL)),YES) +- TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_SDLGL)),YES) +- TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT) +- endif +-endif # ARCH ppc +- +-ifeq ($(ARCH),sparc) +- ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) +- TARGETS += $(BUILDDIR)/sdlquake2 +- endif +- +- ifeq ($(strip $(BUILD_SVGA)),YES) +- $(warning Warning: SVGAlib support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_X11)),YES) +- TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_GLX)),YES) +- $(warning Warning: GLX support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_FXGL)),YES) +- $(warning Warning: FXGL support not supported for $(ARCH)) +- endif +- +- ifeq ($(strip $(BUILD_SDL)),YES) +- TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_SDLGL)),YES) +- $(warning Warning: SDLGL support not supported for $(ARCH)) +- endif +-endif # ARCH sparc +- +-ifeq ($(ARCH),i386) +- ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) +- TARGETS += $(BUILDDIR)/sdlquake2 +- endif +- +- ifeq ($(strip $(BUILD_SVGA)),YES) +- TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_X11)),YES) +- TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_GLX)),YES) +- TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_FXGL)),YES) +- TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_SDL)),YES) +- TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT) +- endif +- +- ifeq ($(strip $(BUILD_SDLGL)),YES) +- TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT) +- endif +-endif # ARCH i386 +- + ifeq ($(strip $(BUILD_AA)),YES) + TARGETS += $(BUILDDIR)/ref_softaa.$(SHLIBEXT) + endif +@@ -437,10 +322,11 @@ + $(BUILDDIR)/client/snd_sdl.o + + ifeq ($(ARCH),i386) ++ifneq ($(strip $(NO_X86_ASM)),YES) + QUAKE2_AS_OBJS = \ + $(BUILDDIR)/client/snd_mixa.o + else +-QUAKE2_AS_OBJS = #blank ++endif + endif + + $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) +@@ -626,7 +512,7 @@ + $(BUILDDIR)/ded/q_shlinux.o \ + $(BUILDDIR)/ded/sys_linux.o \ + $(BUILDDIR)/ded/glob.o \ +- $(BUILDDIR)/ded/net_udp.o \ ++ $(BUILDDIR)/ded/$(NET_UDP).o \ + $(BUILDDIR)/ded/q_shared.o \ + $(BUILDDIR)/ded/pmove.o \ + $(BUILDDIR)/ded/cl_null.o \ +@@ -701,6 +587,9 @@ + $(BUILDDIR)/ded/net_udp.o : $(LINUX_DIR)/net_udp.c + $(DO_DED_CC) + ++$(BUILDDIR)/ded/net_udp6.o : $(LINUX_DIR)/net_udp6.c ++ $(DO_DED_CC) ++ + $(BUILDDIR)/ded/cd_null.o : $(NULL_DIR)/cd_null.c + $(DO_DED_CC) + +@@ -1525,6 +1414,7 @@ + $(BUILDDIR)/ref_soft/glob.o + + ifeq ($(ARCH),i386) ++ifneq ($(strip $(NO_X86_ASM)),YES) + REF_SOFT_OBJS += \ + $(BUILDDIR)/ref_soft/r_aclipa.o \ + $(BUILDDIR)/ref_soft/r_draw16.o \ +@@ -1538,6 +1428,7 @@ + $(BUILDDIR)/ref_soft/r_varsa.o \ + $(BUILDDIR)/ref_soft/sys_dosa.o + endif ++endif + + REF_SOFT_SVGA_OBJS = \ + $(BUILDDIR)/ref_soft/rw_svgalib.o \ +@@ -1667,10 +1558,10 @@ + $(DO_SHLIB_AS) + + $(BUILDDIR)/ref_soft/rw_svgalib.o : $(LINUX_DIR)/rw_svgalib.c +- $(DO_SHLIB_CC) ++ $(DO_SHLIB_CC) $(SVGACFLAGS) + + $(BUILDDIR)/ref_soft/rw_in_svgalib.o : $(LINUX_DIR)/rw_in_svgalib.c +- $(DO_SHLIB_CC) ++ $(DO_SHLIB_CC) $(SVGACFLAGS) + + $(BUILDDIR)/ref_soft/rw_x11.o : $(LINUX_DIR)/rw_x11.c + $(DO_SHLIB_CC) $(XCFLAGS) +@@ -1679,10 +1570,10 @@ + $(DO_SHLIB_CC) $(SDLCFLAGS) + + $(BUILDDIR)/ref_soft/rw_aa.o : $(LINUX_DIR)/rw_aa.c +- $(DO_SHLIB_CC) ++ $(DO_SHLIB_CC) $(AACFLAGS) + + $(BUILDDIR)/ref_soft/rw_in_aa.o : $(LINUX_DIR)/rw_in_aa.c +- $(DO_SHLIB_CC) ++ $(DO_SHLIB_CC) $(AACFLAGS) + + ############################################################################# + # REF_GL |