Index: head/games/egl/files/patch-makefile =================================================================== --- head/games/egl/files/patch-makefile (revision 548181) +++ head/games/egl/files/patch-makefile (revision 548182) @@ -1,230 +1,230 @@ --- makefile.orig Mon Jul 24 15:18:20 2006 +++ makefile Mon Jul 24 15:22:20 2006 @@ -1,19 +1,30 @@ +# GNU Makefile for EGL. + +# Compilation components and options. BUILD_CLIENT?=YES # client executable BUILD_DEDICATED?=YES # server executable BUILD_CGAME?=YES # cgame dll BUILD_GAME?=YES # game dll +WITH_OPT_CFLAGS?=YES # Optimized compiler flags. +WITH_HOMEDIR?=YES # Write files in "~/.egl". +# Common variables. +CC?=gcc VERSION=0.0.6 - -CC=gcc EGL_MAKEFILE=makefile -SHARED_FLAGS:= -RELEASE_CFLAGS=-Isource/ -I./ -I../ $(SHARED_FLAGS) -O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations -DEBUG_CFLAGS=-g -Isource/ -I./ -I../ $(SHARED_FLAGS) -DC_ONLY -LDFLAGS=-ldl -lm -lz -ljpeg -lpng -DED_LDFLAGS=-ldl -lm -lz -MODULE_LDFLAGS=-ldl -lm -X11_LDFLAGS=-L/usr/X11R6/lib -lX11 -lXext + +# Compiler flags. -+SHARED_FLAGS:=-Isource -I./ -I../ $(CFLAGS) ++SHARED_FLAGS:=-Isource -I./ -I../ $(CFLAGS) -fcommon +RELEASE_CFLAGS=$(SHARED_FLAGS) +DEBUG_CFLAGS=$(SHARED_FLAGS) -g -DC_ONLY + +# Linker flags. +LDFLAGS+=-lm +DED_LDFLAGS=-lz +MODULE_LDFLAGS= +X11_LDFLAGS=-lX11 -lXext -ljpeg -lpng -lz + +# Compilation commands. SHLIBCFLAGS=-fPIC SHLIBLDFLAGS=-shared @@ -26,8 +37,22 @@ 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/) SHLIBEXT =so -BUILD_DEBUG_DIR=debug$(ARCH) -BUILD_RELEASE_DIR=release$(ARCH) +OSTYPE := $(shell uname -s) + +BUILD_DEBUG_DIR=debug +BUILD_RELEASE_DIR=release + +ifeq ($(OSTYPE),Linux) +LDFLAGS+=-ldl +endif + +ifeq ($(OSTYPE),FreeBSD) +# These variables are defined from the port, and passed by the environment. +SHARED_FLAGS+= -I$(LOCALBASE)/include \ + -DDATADIR='\"$(Q2DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' +LDFLAGS+= -L$(LOCALBASE)/lib +X11_LDFLAGS+= -lpthread +endif ifeq ($(strip $(BUILD_CLIENT)),YES) TARGETS += $(BUILDDIR)/egl @@ -38,19 +63,27 @@ endif ifeq ($(strip $(BUILD_CGAME)),YES) - TARGETS += $(BUILDDIR)/baseq2/eglcgame$(ARCH).$(SHLIBEXT) + TARGETS += $(BUILDDIR)/baseq2/eglcgame.$(SHLIBEXT) endif ifeq ($(strip $(BUILD_GAME)),YES) - TARGETS += $(BUILDDIR)/baseq2/game$(ARCH).$(SHLIBEXT) + TARGETS += $(BUILDDIR)/baseq2/game.$(SHLIBEXT) endif -ifeq ($(wildcard /usr/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h) +ifeq ($(strip $(WITH_OPT_CFLAGS)),YES) -+RELEASE_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations ++RELEASE_CFLAGS += -O2 -fno-strict-aliasing -ffast-math +endif + +ifeq ($(strip $(WITH_HOMEDIR)),YES) +SHARED_FLAGS += -DHOMEDIR +endif + +ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h) SHARED_FLAGS += -DXF86VMODE X11_LDFLAGS += -lXxf86vm endif -ifeq ($(wildcard /usr/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h) +ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h) SHARED_FLAGS += -DXF86DGA X11_LDFLAGS += -lXxf86dga endif @@ -111,6 +144,7 @@ $(BUILDDIR)/client/sv_user.o \ $(BUILDDIR)/client/sv_world.o \ \ + $(BUILDDIR)/client/cl_acapi.o \ $(BUILDDIR)/client/cl_cgapi.o \ $(BUILDDIR)/client/cl_cin.o \ $(BUILDDIR)/client/cl_console.o \ @@ -135,7 +169,7 @@ \ $(BUILDDIR)/client/r_math.o \ $(BUILDDIR)/client/rb_batch.o \ - $(BUILDDIR)/client/rb_cin.o \ + $(BUILDDIR)/client/rf_video.o \ $(BUILDDIR)/client/rb_entity.o \ $(BUILDDIR)/client/rb_light.o \ $(BUILDDIR)/client/rb_math.o \ @@ -173,7 +207,6 @@ $(BUILDDIR)/client/x11_main.o \ $(BUILDDIR)/client/x11_utils.o \ \ - $(BUILDDIR)/client/byteswap.o \ $(BUILDDIR)/client/infostrings.o \ $(BUILDDIR)/client/m_angles.o \ $(BUILDDIR)/client/m_bounds.o \ @@ -222,6 +255,7 @@ $(BUILDDIR)/client/sv_user.o: $(SOURCEDIR)/server/sv_user.c; $(DO_CC) $(BUILDDIR)/client/sv_world.o: $(SOURCEDIR)/server/sv_world.c; $(DO_CC) +$(BUILDDIR)/client/cl_acapi.o: $(SOURCEDIR)/client/cl_acapi.c; $(DO_CC) $(BUILDDIR)/client/cl_cgapi.o: $(SOURCEDIR)/client/cl_cgapi.c; $(DO_CC) $(BUILDDIR)/client/cl_cin.o: $(SOURCEDIR)/client/cl_cin.c; $(DO_CC) $(BUILDDIR)/client/cl_console.o: $(SOURCEDIR)/client/cl_console.c; $(DO_CC) @@ -246,7 +280,7 @@ $(BUILDDIR)/client/r_math.o: $(SOURCEDIR)/renderer/r_math.c; $(DO_CC) $(BUILDDIR)/client/rb_batch.o: $(SOURCEDIR)/renderer/rb_batch.c; $(DO_CC) -$(BUILDDIR)/client/rb_cin.o: $(SOURCEDIR)/renderer/rb_cin.c; $(DO_CC) +$(BUILDDIR)/client/rf_video.o: $(SOURCEDIR)/renderer/rf_video.c; $(DO_CC) $(BUILDDIR)/client/rb_entity.o: $(SOURCEDIR)/renderer/rb_entity.c; $(DO_CC) $(BUILDDIR)/client/rb_light.o: $(SOURCEDIR)/renderer/rb_light.c; $(DO_CC) $(BUILDDIR)/client/rb_math.o: $(SOURCEDIR)/renderer/rb_math.c; $(DO_CC) @@ -284,7 +318,6 @@ $(BUILDDIR)/client/x11_main.o: $(SOURCEDIR)/unix/x11_main.c; $(DO_CC) $(BUILDDIR)/client/x11_utils.o: $(SOURCEDIR)/unix/x11_utils.c; $(DO_CC) -$(BUILDDIR)/client/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_CC) $(BUILDDIR)/client/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_CC) $(BUILDDIR)/client/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_CC) $(BUILDDIR)/client/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_CC) @@ -337,7 +370,6 @@ $(BUILDDIR)/dedicated/unix_main.o \ $(BUILDDIR)/dedicated/unix_udp.o \ \ - $(BUILDDIR)/dedicated/byteswap.o \ $(BUILDDIR)/dedicated/infostrings.o \ $(BUILDDIR)/dedicated/m_angles.o \ $(BUILDDIR)/dedicated/m_bounds.o \ @@ -355,7 +387,7 @@ $(BUILDDIR)/eglded: $(OBJS_DEDICATED) @echo Linking eglded; - $(CC) $(CFLAGS) -o $@ $(OBJS_DEDICATED) $(DED_LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS_DEDICATED) $(LDFLAGS) $(DED_LDFLAGS) $(BUILDDIR)/dedicated/alias.o: $(SOURCEDIR)/common/alias.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/cbuf.o: $(SOURCEDIR)/common/cbuf.c; $(DO_DED_CC) @@ -390,7 +422,6 @@ $(BUILDDIR)/dedicated/unix_main.o: $(SOURCEDIR)/unix/unix_main.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/unix_udp.o: $(SOURCEDIR)/unix/unix_udp.c; $(DO_DED_CC) -$(BUILDDIR)/dedicated/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_DED_CC) @@ -475,7 +506,6 @@ \ $(BUILDDIR)/baseq2/cgame/pmove.o \ \ - $(BUILDDIR)/baseq2/cgame/byteswap.o \ $(BUILDDIR)/baseq2/cgame/infostrings.o \ $(BUILDDIR)/baseq2/cgame/m_angles.o \ $(BUILDDIR)/baseq2/cgame/m_bounds.o \ @@ -490,9 +520,9 @@ $(BUILDDIR)/baseq2/cgame/m_flash.o \ -$(BUILDDIR)/baseq2/eglcgame$(ARCH).$(SHLIBEXT): $(OBJS_CGAME) +$(BUILDDIR)/baseq2/eglcgame.$(SHLIBEXT): $(OBJS_CGAME) @echo Linking cgame dll; - $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_CGAME) $(MODULE_LDFLAGS) + $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_CGAME) $(LDFLAGS) $(MODULE_LDFLAGS) $(BUILDDIR)/baseq2/cgame/cg_api.o: $(SOURCEDIR)/cgame/cg_api.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/cg_console.o: $(SOURCEDIR)/cgame/cg_console.c; $(DO_SHLIB_CC) @@ -557,7 +587,6 @@ $(BUILDDIR)/baseq2/cgame/ui_keys.o: $(SOURCEDIR)/cgame/ui/ui_keys.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/pmove.o: $(SOURCEDIR)/cgame/pmove.c; $(DO_SHLIB_CC) -$(BUILDDIR)/baseq2/cgame/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_SHLIB_CC) @@ -625,7 +654,6 @@ $(BUILDDIR)/baseq2/game/p_view.o \ $(BUILDDIR)/baseq2/game/p_weapon.o \ \ - $(BUILDDIR)/baseq2/game/byteswap.o \ $(BUILDDIR)/baseq2/game/infostrings.o \ $(BUILDDIR)/baseq2/game/m_angles.o \ $(BUILDDIR)/baseq2/game/m_bounds.o \ @@ -639,9 +667,9 @@ $(BUILDDIR)/baseq2/game/string.o \ -$(BUILDDIR)/baseq2/game$(ARCH).$(SHLIBEXT): $(OBJS_GAME) +$(BUILDDIR)/baseq2/game.$(SHLIBEXT): $(OBJS_GAME) @echo Linking game dll; - $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_GAME) $(MODULE_LDFLAGS) + $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_GAME) $(LDFLAGS) $(MODULE_LDFLAGS) $(BUILDDIR)/baseq2/game/g_ai.o: $(SOURCEDIR)/game/g_ai.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/g_chase.o: $(SOURCEDIR)/game/g_chase.c; $(DO_SHLIB_CC) @@ -691,7 +719,6 @@ $(BUILDDIR)/baseq2/game/p_view.o: $(SOURCEDIR)/game/p_view.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/p_weapon.o: $(SOURCEDIR)/game/p_weapon.c; $(DO_SHLIB_CC) -$(BUILDDIR)/baseq2/game/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_SHLIB_CC) Index: head/games/q2p/files/patch-Makefile =================================================================== --- head/games/q2p/files/patch-Makefile (revision 548181) +++ head/games/q2p/files/patch-Makefile (revision 548182) @@ -1,239 +1,243 @@ ---- ./Makefile.orig Sun Dec 31 14:01:34 2006 -+++ ./Makefile Fri Jan 5 15:51:35 2007 +--- Makefile.orig 2006-12-31 17:01:34 UTC ++++ Makefile @@ -9,7 +9,7 @@ # Check OS type. OSTYPE= $(shell uname -s | tr A-Z a-z) -ARCH= $(shell uname -m | sed -e s/i.86/i386/) +ARCH?= $(shell uname -m | sed -e s/i.86/i386/) MARCH= $(shell uname -m) OP_SYSTEM= $(shell uname -sr) @@ -27,75 +27,75 @@ BUILD_RELEASE_DIR:=build_release # verbose compilation # # process. # #===========================# -VERBOSE=NO +VERBOSE=YES #===========================# # Q2P Client # #===========================# -BUILD_Q2P=YES +BUILD_Q2P?=NO #===========================# # Enable Optimizations. # # Release build only. # #===========================# -OPTIMIZE=NO +OPTIMIZE?=NO #===========================# # Remove symbols from # # binaries, reduce size. # # Release build only. # #===========================# -STRIP=YES +STRIP?=YES #===========================# # Sound Drivers # #===========================# ifeq ($(OSTYPE),linux) -BUILD_ALSA_SND=YES +BUILD_ALSA_SND?=NO endif -BUILD_OSS_SND=YES -BUILD_SDL_SND=YES +BUILD_OSS_SND?=NO +BUILD_SDL_SND?=NO #===========================# # Quake 2 dedicated server. # #===========================# -BUILD_DEDICATED=YES +BUILD_DEDICATED?=NO #===========================# # GLX, SDL-GLX # # render. # #===========================# -BUILD_GLX=YES -BUILD_SDLGL=YES +BUILD_GLX?=NO +BUILD_SDLGL?=NO #===========================# # Linked To GLU library. # #===========================# -WITH_GLULIB=YES +WITH_GLULIB?=YES #===========================# # Built in DGA mouse # # support. # #===========================# -WITH_XF86_DGA=NO +WITH_XF86_DGA?=YES #===========================# # Read from $(DATADIR) and # # write to "~/.quake2" # #===========================# -WITH_DATADIR=NO +WITH_DATADIR?=YES #===========================# # Load renderers # # from $(LIBDIR) # #===========================# -WITH_LIBDIR=NO +WITH_LIBDIR?=YES #===========================# # Built in CD Audio # # support. # #===========================# -WITH_CDAUDIO=NO +WITH_CDAUDIO?=YES ifeq ($(OSTYPE),freebsd) CD_API=cd_freebsd.c endif @@ -107,22 +107,19 @@ endif # Enable XMMS/Audacious # # support. Only one of them # # at same time. # -# No yet for FreeBSD :( # #===========================# -ifeq ($(OSTYPE),linux) -WITH_AUDACIOUS=YES -WITH_XMMS=NO -endif +WITH_AUDACIOUS?=NO +WITH_XMMS?=NO #===========================# # Quake 2 game library. # #===========================# -BUILD_GAME=YES +BUILD_GAME?=NO #===========================# # CTF Library. # #===========================# -BUILD_CTF=YES +BUILD_CTF?=NO CLIENT_DIR=$(MOUNT_DIR)/client @@ -133,24 +130,24 @@ UNIX_DIR=$(MOUNT_DIR)/unix GAME_DIR=$(MOUNT_DIR)/game CTF_DIR=$(MOUNT_DIR)/ctf -CC=gcc +CC?=gcc CC_VERSION=$(shell $(CC) -dumpversion) -X11BASE= /usr/X11R6 -LOCALBASE= /usr/local -GAMEBASE= /usr/local -SYSBINDIR=$(LOCALBASE)/bin +X11BASE?= /usr/local +LOCALBASE?= /usr/local +GAMEBASE?= $(PREFIX) +SYSBINDIR?= $(PREFIX)/bin ifeq ($(OSTYPE),freebsd) - DATADIR= $(GAMEBASE)/share/quake2 - LIBDIR= $(GAMEBASE)/lib/quake2 + DATADIR?= $(GAMEBASE)/share/quake2 + LIBDIR?= $(GAMEBASE)/lib/quake2 else - DATADIR= $(GAMEBASE)/games/quake2 - LIBDIR= $(GAMEBASE)/games/quake2 + DATADIR?= $(GAMEBASE)/games/quake2 + LIBDIR?= $(GAMEBASE)/games/quake2 endif SHLIB_EXT=so -GAME_NAME=game$(ARCH).$(SHLIB_EXT) +GAME_NAME=game.$(SHLIB_EXT) BASE_CFLAGS+=-I$(LOCALBASE)/include \ -I$(X11BASE)/include \ -@@ -168,15 +165,11 @@ RELEASE_CFLAGS+=$(BASE_CFLAGS) \ +@@ -158,25 +155,18 @@ BASE_CFLAGS+=-I$(LOCALBASE)/include \ + -DGAME_NAME='\"$(GAME_NAME)\"' \ + -DQ2P_VERSION='\"$(VERSION)\"' \ + -DCC_VERSION='\"$(CC_VERSION)\"' \ +- -Wall \ ++ -Wall -fcommon \ + -pipe #-Werror + RELEASE_CFLAGS+=$(BASE_CFLAGS) \ +- -ffloat-store \ + -fno-strict-aliasing \ + -DNDEBUG + ifeq ($(strip $(OPTIMIZE)),YES) RELEASE_CFLAGS+=-O3 \ - -march=$(MARCH) \ -funroll-loops \ - -fstrength-reduce \ - -fexpensive-optimizations \ +- -fstrength-reduce \ +- -fexpensive-optimizations \ - -falign-loops=2 \ - -falign-jumps=2 \ - -falign-functions=2 -else - RELEASE_CFLAGS+=-O2 + -fomit-frame-pointer \ + -ffast-math endif ifeq ($(strip $(STRIP)),YES) @@ -263,7 +256,7 @@ ifeq ($(strip $(BUILD_Q2P)),YES) endif ifeq ($(strip $(BUILD_DEDICATED)),YES) - TARGETS += $(BINDIR)/q2p-dedicated + TARGETS += $(BINDIR)/q2p-ded DED_CFLAGS += -DDEDICATED_ONLY endif @@ -292,11 +285,11 @@ ifeq ($(strip $(BUILD_SDLGL)),YES) endif ifeq ($(strip $(BUILD_GAME)),YES) - TARGETS+=$(BINDIR)/baseq2/game$(ARCH).$(SHLIB_EXT) + TARGETS+=$(BINDIR)/baseq2/game.$(SHLIB_EXT) endif ifeq ($(strip $(BUILD_CTF)),YES) - TARGETS+=$(BINDIR)/ctf/game$(ARCH).$(SHLIB_EXT) + TARGETS+=$(BINDIR)/ctf/game.$(SHLIB_EXT) endif all: @@ -585,7 +578,7 @@ $(BUILDDIR)/ded/sh_unix.o $(BUILDDIR)/d $(BUILDDIR)/ded/q_shared.o $(BUILDDIR)/ded/pmove.o \ $(BUILDDIR)/ded/cl_null.o $(BUILDDIR)/ded/cd_null.o -$(BINDIR)/q2p-dedicated : $(Q2PDED_OBJS) +$(BINDIR)/q2p-ded : $(Q2PDED_OBJS) @echo @echo "**Built Q2P dedicated client with cflags:" @echo "$(CC) $(CC_VERSION)"; @@ -709,7 +702,7 @@ $(BUILDDIR)/game/m_parasite.o $(BUILDDIR $(BUILDDIR)/game/m_tank.o $(BUILDDIR)/game/p_hud.o $(BUILDDIR)/game/p_trail.o \ $(BUILDDIR)/game/p_view.o $(BUILDDIR)/game/p_weapon.o $(BUILDDIR)/game/m_flash.o -$(BINDIR)/baseq2/game$(ARCH).$(SHLIB_EXT) : $(GAME_OBJS) +$(BINDIR)/baseq2/game.$(SHLIB_EXT) : $(GAME_OBJS) @echo @echo "**Built $@ with cflags:" @echo "$(CC) $(CC_VERSION) $(CFLAGS)"; @@ -784,7 +777,7 @@ $(BUILDDIR)/ctf/m_move.o $(BUILDDIR)/ $(BUILDDIR)/ctf/p_menu.o $(BUILDDIR)/ctf/p_trail.o $(BUILDDIR)/ctf/p_view.o \ $(BUILDDIR)/ctf/p_weapon.o $(BUILDDIR)/ctf/q_shared.o -$(BINDIR)/ctf/game$(ARCH).$(SHLIB_EXT) : $(CTF_OBJS) +$(BINDIR)/ctf/game.$(SHLIB_EXT) : $(CTF_OBJS) @echo @echo "**Built $@ with cflags:" @echo "$(CC) $(CC_VERSION) $(CFLAGS)"; -@@ -935,4 +928,4 @@ bz2: - @tar cjvf $(Q2P_VERSION_BZ2)-$(OSTYPE)-$(DATE).tar.bz2 $(BINDIR) - @printf ".... Done.\n" - -- -\ No newline at end of file -+