diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2006-03-23 22:24:03 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2006-03-23 22:24:03 +0000 |
commit | 96fe98e1c6bc0301781b0dd7dbfeef3e3f137f43 (patch) | |
tree | 7650cfe102643b74d6ad1d3efe1771281b5e66f0 /games/q3cellshading/files | |
parent | - Cacti developers has modified one of oficial patches. (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_5_5_0'.release/5.5.0
Notes
Notes:
svn path=/head/; revision=158034
svn path=/tags/RELEASE_5_5_0/; revision=158035; tag=release/5.5.0
Diffstat (limited to 'games/q3cellshading/files')
20 files changed, 0 insertions, 451 deletions
diff --git a/games/q3cellshading/files/patch-code-Construct b/games/q3cellshading/files/patch-code-Construct deleted file mode 100644 index 8ec4aa967b32..000000000000 --- a/games/q3cellshading/files/patch-code-Construct +++ /dev/null @@ -1,69 +0,0 @@ ---- code/Construct.orig Mon Aug 15 20:56:27 2005 -+++ code/Construct Wed Nov 23 10:37:04 2005 -@@ -19,8 +19,8 @@ - use Cons_gcc; - - # defaults --$config = 'debug'; --$do_smp = 1; -+$config = 'release'; -+$do_smp = 0; - $do_masterserver = 0; - $do_authserver = 0; - $do_authport = 0; -@@ -32,8 +32,8 @@ - $DO_WIN32 = 0; - $NO_VM = 0; - $NO_SO = 0; --$CC='gcc'; --$CXX='g++'; -+$CC=$ENV{CC}; -+$CXX=$ENV{CXX}; - - # detect an sdk build (don't attempt client build and other things) - if ( -r 'unix/Conscript-client' ) -@@ -63,9 +63,9 @@ - else - { - # libc .. do the little magic! -- $libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3'; -- $libc = `$libc_cmd`; -- chop ($libc); -+ # $libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3'; -+ # $libc = `$libc_cmd`; -+ # chop ($libc); - } - - if ($DO_WIN32 eq 1) -@@ -227,7 +227,7 @@ - # build the config directory - $CONFIG_DIR = $config . '-' . $cpu . '-' . $OS . '-' . $libc; - --$COMMON_CFLAGS = '-pipe -fsigned-char '; -+$COMMON_CFLAGS = '-pipe -fsigned-char -I/usr/local/include -L/usr/local/lib -I/usr/X11R6/include -L/usr/X11R6/lib '; - - if ($config eq 'debug') - { -@@ -237,7 +237,7 @@ - } - else - { -- $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce '; -+ $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce '; - $BSPC_BASE_CFLAGS = $BASE_CFLAGS . '-DLINUX -DBSPC -Dstricmp=strcasecmp '; - } - -@@ -287,11 +287,11 @@ - system("mkdir qvmtools 2>/dev/null"); - if (@_[0] eq 'q3lcc') - { -- system("cd ../lcc ; make all ; cp /tmp/lcc ../code/qvmtools/q3lcc ; cp /tmp/rcc ../code/qvmtools/q3rcc ; cp /tmp/cpp ../code/qvmtools/q3cpp"); -+ system("cd ../lcc ; gmake all ; cp ../lcc/build/lcc ../code/qvmtools/q3lcc ; cp ../lcc/build/rcc ../code/qvmtools/q3rcc ; cp ../lcc/build/cpp ../code/qvmtools/q3cpp"); - } - elsif (@_[0] eq 'q3asm') - { -- system("cd ../q3asm ; make ; cp q3asm ../code/qvmtools"); -+ system("cd ../q3asm ; gmake ; cp q3asm ../code/qvmtools"); - } - else - { diff --git a/games/q3cellshading/files/patch-code-botlib-linux-i386.mak b/games/q3cellshading/files/patch-code-botlib-linux-i386.mak deleted file mode 100644 index 2fadee73c19a..000000000000 --- a/games/q3cellshading/files/patch-code-botlib-linux-i386.mak +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/botlib/linux-i386.mak ../quake3-1.32b-BUILT/./code/botlib/linux-i386.mak ---- ./code/botlib/linux-i386.mak Wed May 23 15:07:59 2001 -+++ ../quake3-1.32b-BUILT/./code/botlib/linux-i386.mak Mon Aug 22 20:55:02 2005 -@@ -14,7 +14,7 @@ - #use these when debugging - #CFLAGS=$(BASE_CFLAGS) -g - --LDFLAGS=-ldl -lm -+LDFLAGS=-lm - SHLIBEXT=so - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared diff --git a/games/q3cellshading/files/patch-code-bspc-Conscript b/games/q3cellshading/files/patch-code-bspc-Conscript deleted file mode 100644 index 08ed1797e7c2..000000000000 --- a/games/q3cellshading/files/patch-code-bspc-Conscript +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/bspc/Conscript ../quake3-1.32b-BUILT/./code/bspc/Conscript ---- ./code/bspc/Conscript Tue Aug 16 01:47:07 2005 -+++ ../quake3-1.32b-BUILT/./code/bspc/Conscript Mon Aug 22 20:54:27 2005 -@@ -67,7 +67,7 @@ - CXX => $CXX, - LINK => $LINK, - CFLAGS => $BSPC_BASE_CFLAGS, -- LIBS => '-ldl -lm -lpthread' -+ LIBS => '-lm -lpthread' - ); - - Program $env 'bspc', @$BSPC_REF; diff --git a/games/q3cellshading/files/patch-code-bspc-Makefile b/games/q3cellshading/files/patch-code-bspc-Makefile deleted file mode 100644 index d8a00e38bfd4..000000000000 --- a/games/q3cellshading/files/patch-code-bspc-Makefile +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/bspc/Makefile ../quake3-1.32b-BUILT/./code/bspc/Makefile ---- ./code/bspc/Makefile Wed May 23 15:07:59 2001 -+++ ../quake3-1.32b-BUILT/./code/bspc/Makefile Mon Aug 22 20:54:39 2005 -@@ -18,7 +18,7 @@ - #use these when debugging - #CFLAGS=$(BASE_CFLAGS) -g - --LDFLAGS=-ldl -lm -lpthread -+LDFLAGS=-lm -lpthread - - DO_CC=$(CC) $(CFLAGS) -o $@ -c $< - diff --git a/games/q3cellshading/files/patch-code-bspc-linux-i386.mak b/games/q3cellshading/files/patch-code-bspc-linux-i386.mak deleted file mode 100644 index d8be0355f149..000000000000 --- a/games/q3cellshading/files/patch-code-bspc-linux-i386.mak +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/bspc/linux-i386.mak ../quake3-1.32b-BUILT/./code/bspc/linux-i386.mak ---- ./code/bspc/linux-i386.mak Wed May 23 15:07:59 2001 -+++ ../quake3-1.32b-BUILT/./code/bspc/linux-i386.mak Mon Aug 22 20:54:48 2005 -@@ -14,7 +14,7 @@ - #use these when debugging - #CFLAGS=$(BASE_CFLAGS) -g - --LDFLAGS=-ldl -lm -lpthread -+LDFLAGS=-lm -lpthread - - DO_CC=$(CC) $(CFLAGS) -o $@ -c $< - diff --git a/games/q3cellshading/files/patch-code-cgame-Conscript b/games/q3cellshading/files/patch-code-cgame-Conscript deleted file mode 100644 index 8e19ef9e567c..000000000000 --- a/games/q3cellshading/files/patch-code-cgame-Conscript +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/cgame/Conscript ../quake3-1.32b-BUILT/./code/cgame/Conscript ---- ./code/cgame/Conscript Sun Jan 19 18:03:48 2003 -+++ ../quake3-1.32b-BUILT/./code/cgame/Conscript Mon Aug 22 20:54:15 2005 -@@ -22,7 +22,7 @@ - LINK => $LINK, - ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} }, - CFLAGS => $BASE_CFLAGS . '-fPIC', -- LDFLAGS => '-shared -ldl -lm' -+ LDFLAGS => '-shared -lm' - ); - - # for TA, use -DMISSIONPACK diff --git a/games/q3cellshading/files/patch-code-game-Conscript b/games/q3cellshading/files/patch-code-game-Conscript deleted file mode 100644 index d6ae11d79bea..000000000000 --- a/games/q3cellshading/files/patch-code-game-Conscript +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/game/Conscript ../quake3-1.32b-BUILT/./code/game/Conscript ---- ./code/game/Conscript Sun Jan 19 18:03:48 2003 -+++ ../quake3-1.32b-BUILT/./code/game/Conscript Mon Aug 22 20:54:04 2005 -@@ -21,7 +21,7 @@ - LINK => $LINK, - ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} }, - CFLAGS => $BASE_CFLAGS . '-fPIC', -- LDFLAGS => '-shared -ldl -lm' -+ LDFLAGS => '-shared -lm' - ); - - # for TA, use -DMISSIONPACK diff --git a/games/q3cellshading/files/patch-code-game-q_shared.h b/games/q3cellshading/files/patch-code-game-q_shared.h deleted file mode 100644 index d628bf7b5a3c..000000000000 --- a/games/q3cellshading/files/patch-code-game-q_shared.h +++ /dev/null @@ -1,17 +0,0 @@ -diff -ruN ./code/game/q_shared.h ../quake3-1.32b-BUILT/./code/game/q_shared.h ---- ./code/game/q_shared.h Tue Aug 16 02:10:07 2005 -+++ ../quake3-1.32b-BUILT/./code/game/q_shared.h Tue Aug 23 14:16:34 2005 -@@ -452,13 +452,9 @@ - void *Hunk_Alloc( int size, ha_pref preference ); - #endif - --#ifdef __linux__ - // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=371 - // custom Snd_Memset implementation for glibc memset bug workaround - void Snd_Memset (void* dest, const int val, const size_t count); --#else --#define Snd_Memset Com_Memset --#endif - - #if !( defined __VECTORC ) - void Com_Memset (void* dest, const int val, const size_t count); diff --git a/games/q3cellshading/files/patch-code-q3_ui-Conscript b/games/q3cellshading/files/patch-code-q3_ui-Conscript deleted file mode 100644 index bbddde9f2ca5..000000000000 --- a/games/q3cellshading/files/patch-code-q3_ui-Conscript +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/q3_ui/Conscript ../quake3-1.32b-BUILT/./code/q3_ui/Conscript ---- ./code/q3_ui/Conscript Sun Jan 19 18:03:48 2003 -+++ ../quake3-1.32b-BUILT/./code/q3_ui/Conscript Mon Aug 22 20:56:57 2005 -@@ -16,7 +16,7 @@ - LINK => $LINK, - ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} }, - CFLAGS => $BASE_CFLAGS . '-fPIC', -- LDFLAGS => '-shared -ldl -lm' -+ LDFLAGS => '-shared -lm' - ); - - # qvm building diff --git a/games/q3cellshading/files/patch-code-qcommon-common.c b/games/q3cellshading/files/patch-code-qcommon-common.c deleted file mode 100644 index 9db06e6c63a5..000000000000 --- a/games/q3cellshading/files/patch-code-qcommon-common.c +++ /dev/null @@ -1,19 +0,0 @@ ---- code/qcommon/common.c.orig Mon Aug 15 23:10:07 2005 -+++ code/qcommon/common.c Wed Nov 23 10:53:29 2005 -@@ -24,15 +24,8 @@ - #include "../game/q_shared.h" - #include "qcommon.h" - #include <setjmp.h> --#ifdef __linux__ -+#include <sys/types.h> - #include <netinet/in.h> --#else --#if defined(MACOS_X) --#include <netinet/in.h> --#else --#include <winsock.h> --#endif --#endif - - int demo_protocols[] = - { 66, 67, 68, 0 }; diff --git a/games/q3cellshading/files/patch-code-ui-Conscript b/games/q3cellshading/files/patch-code-ui-Conscript deleted file mode 100644 index 0b19a27ed11f..000000000000 --- a/games/q3cellshading/files/patch-code-ui-Conscript +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/ui/Conscript ../quake3-1.32b-BUILT/./code/ui/Conscript ---- ./code/ui/Conscript Sun Jan 19 18:03:48 2003 -+++ ../quake3-1.32b-BUILT/./code/ui/Conscript Mon Aug 22 20:53:50 2005 -@@ -16,7 +16,7 @@ - LINK => $LINK, - ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} }, - CFLAGS => $BASE_CFLAGS . '-DMISSIONPACK -fPIC', -- LDFLAGS => '-shared -ldl -lm' -+ LDFLAGS => '-shared -lm' - ); - - # qvm building diff --git a/games/q3cellshading/files/patch-code-unix-Conscript-client b/games/q3cellshading/files/patch-code-unix-Conscript-client deleted file mode 100644 index d96e68cfd001..000000000000 --- a/games/q3cellshading/files/patch-code-unix-Conscript-client +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN ./code/unix/Conscript-client ../quake3-1.32b-BUILT/./code/unix/Conscript-client ---- ./code/unix/Conscript-client Mon Aug 15 23:56:27 2005 -+++ ../quake3-1.32b-BUILT/./code/unix/Conscript-client Mon Aug 22 21:55:50 2005 -@@ -153,7 +153,7 @@ - . $BUILD_DIR . '/unix/asmlib.a ' - . $BUILD_DIR . '/unix/inlinelib.a ' - . $BASE_LDFLAGS -- . '-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -ldl -lm' -+ . '-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm' - ); - - @RENDERER_FILES = qw( -@@ -231,7 +231,6 @@ - ../unix/linux_common.c - ../unix/linux_qgl.c - ../unix/linux_glimp.c -- ../unix/linux_joystick.c - ../unix/linux_snd.c - ../unix/linux_signals.c - ); diff --git a/games/q3cellshading/files/patch-code-unix-Conscript-dedicated b/games/q3cellshading/files/patch-code-unix-Conscript-dedicated deleted file mode 100644 index 3de75039ffe0..000000000000 --- a/games/q3cellshading/files/patch-code-unix-Conscript-dedicated +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./code/unix/Conscript-dedicated ../quake3-1.32b-BUILT/./code/unix/Conscript-dedicated ---- ./code/unix/Conscript-dedicated Mon Aug 15 23:56:27 2005 -+++ ../quake3-1.32b-BUILT/./code/unix/Conscript-dedicated Mon Aug 22 20:52:42 2005 -@@ -63,7 +63,7 @@ - ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} }, - # FIXME TTimo I'm not sure about what C_ONLY is for - CFLAGS => $BASE_CFLAGS . '-DC_ONLY', -- LDFLAGS => '-ldl -lm', -+ LDFLAGS => '-lm', - LIBS => ' ' - . $BUILD_DIR . '/unix/botlib.a ' - . $BUILD_DIR . '/unix/asmlib.a ' diff --git a/games/q3cellshading/files/patch-code-unix-Makefile b/games/q3cellshading/files/patch-code-unix-Makefile deleted file mode 100644 index 47f9174f8a2e..000000000000 --- a/games/q3cellshading/files/patch-code-unix-Makefile +++ /dev/null @@ -1,99 +0,0 @@ ---- code/unix/Makefile.orig Sun May 5 07:21:10 2002 -+++ code/unix/Makefile Sun Nov 20 18:48:48 2005 -@@ -136,7 +136,7 @@ - ifeq ($(ARCH),ppc) - NEWPGCC=/loki/global/ppc/bin/gcc - CC=$(NEWPGCC) -- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce - else - #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205 - #NEWPGCC=/loki/global/x86/bin/gcc -@@ -146,9 +146,9 @@ - # TTimo: legacy RELEASE_CFLAGS - # NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box - # but building on the Mdk 7.2 baseline seems to work -- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce - # TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed) --# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce - endif - endif - -@@ -162,7 +162,7 @@ - RANLIB=ranlib - - THREAD_LDFLAGS=-lpthread -- LDFLAGS=-ldl -lm -+ LDFLAGS=-lm - GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm - - ifeq ($(ARCH),axp) -@@ -223,7 +223,7 @@ - #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc - NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc - CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi ) --RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce -+RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing - fstrength-reduce - endif - - LIBEXT=a -@@ -283,7 +283,7 @@ - ARFLAGS=ar rv - RANLIB=ranlib - --LDFLAGS=-ldl -lm -+LDFLAGS=-lm - GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm - - TARGETS=$(B)/sgiquake3 \ -@@ -312,7 +312,7 @@ - ifeq ($(PLATFORM),freebsd) - LDFLAGS=-lm - else --LDFLAGS=-ldl -lm -+LDFLAGS=-lm - endif # ifeq freebsd - - TARGETS=\ -@@ -578,7 +578,6 @@ - $(B)/client/linux_common.o \ - $(B)/client/linux_qgl.o \ - $(B)/client/linux_glimp.o \ -- $(B)/client/linux_joystick.o \ - $(B)/client/linux_snd.o \ - $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ -@@ -587,7 +586,6 @@ - $(B)/client/linux_common.o \ - $(B)/client/linux_qgl.o \ - $(B)/client/linux_glimp_smp.o \ -- $(B)/client/linux_joystick.o \ - $(B)/client/linux_snd.o \ - $(B)/client/snd_mixa.o \ - $(B)/client/matha.o -@@ -754,7 +752,6 @@ - $(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_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) - $(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) - $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -@@ -1629,7 +1626,6 @@ - \ - $(B)/q3static/linux_qgl.o \ - $(B)/q3static/linux_glimp.o \ -- $(B)/q3static/linux_joystick.o \ - $(B)/q3static/linux_snd.o \ - $(B)/q3static/snd_mixa.o \ - $(B)/q3static/matha.o -@@ -1779,7 +1775,6 @@ - $(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.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 - $(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC - $(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC diff --git a/games/q3cellshading/files/patch-code-unix-cons b/games/q3cellshading/files/patch-code-unix-cons deleted file mode 100644 index b2e41f55f747..000000000000 --- a/games/q3cellshading/files/patch-code-unix-cons +++ /dev/null @@ -1,27 +0,0 @@ ---- code/unix/cons.orig Fri Jun 14 13:01:32 2002 -+++ code/unix/cons Wed Nov 23 10:32:49 2005 -@@ -271,11 +271,11 @@ - # Defaults for a typical (?) UNIX platform. - # Your mileage may vary. - 'unix' => [ -- 'CC' => 'cc', -- 'CFLAGS' => '', -+ 'CC' => $ENV{CC}, -+ 'CFLAGS' => $ENV{CFLAGS}, - 'CCCOM' => '%CC %CFLAGS %_IFLAGS -c %< -o %>', -- 'CXX' => '%CC', -- 'CXXFLAGS' => '%CFLAGS', -+ 'CXX' => $ENV{CXX}, -+ 'CXXFLAGS' => $ENV{CXXFLAGS}, - 'CXXCOM' => '%CXX %CXXFLAGS %_IFLAGS -c %< -o %>', - 'INCDIRPREFIX' => '-I', - 'INCDIRSUFFIX' => '', -@@ -294,7 +294,7 @@ - 'LD' => 'ld', - 'LDFLAGS' => '', - 'PREFLIB' => 'lib', -- 'ENV' => { 'PATH' => '/bin:/usr/bin' }, -+ 'ENV' => { 'PATH' => '/bin:/usr/bin:/usr/local/bin' }, - ], - ); - diff --git a/games/q3cellshading/files/patch-code-unix-linux_common.c b/games/q3cellshading/files/patch-code-unix-linux_common.c deleted file mode 100644 index a03c4f64ece7..000000000000 --- a/games/q3cellshading/files/patch-code-unix-linux_common.c +++ /dev/null @@ -1,18 +0,0 @@ -diff -ruN ./code/unix/linux_common.c ../quake3-1.32b-BUILT/./code/unix/linux_common.c ---- ./code/unix/linux_common.c Tue Aug 16 02:10:07 2005 -+++ ../quake3-1.32b-BUILT/./code/unix/linux_common.c Tue Aug 23 13:38:35 2005 -@@ -33,6 +33,7 @@ - #include <unistd.h> // AH - for size_t - #include <string.h> - -+ - // bk001207 - we need something under Linux, too. Mac? - #if 1 // defined(C_ONLY) // bk010102 - dedicated? - void Com_Memcpy (void* dest, const void* src, const size_t count) { -@@ -340,5 +341,6 @@ - break; - } - } -+ - - #endif diff --git a/games/q3cellshading/files/patch-code-unix-linux_glimp.c b/games/q3cellshading/files/patch-code-unix-linux_glimp.c deleted file mode 100644 index e4c4654000b4..000000000000 --- a/games/q3cellshading/files/patch-code-unix-linux_glimp.c +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN ./code/unix/linux_glimp.c ../quake3-1.32b-BUILT/./code/unix/linux_glimp.c ---- ./code/unix/linux_glimp.c Tue Aug 16 02:10:07 2005 -+++ ../quake3-1.32b-BUILT/./code/unix/linux_glimp.c Mon Aug 22 22:11:16 2005 -@@ -1774,7 +1774,5 @@ - // bk010216 - added stubs for non-Linux UNIXes here - // FIXME - use NO_JOYSTICK or something else generic - --#if defined( __FreeBSD__ ) // rb010123 - void IN_StartupJoystick( void ) {} - void IN_JoyMove( void ) {} --#endif diff --git a/games/q3cellshading/files/patch-code-unix-unix_shared.c b/games/q3cellshading/files/patch-code-unix-unix_shared.c deleted file mode 100644 index 013c39f2bc13..000000000000 --- a/games/q3cellshading/files/patch-code-unix-unix_shared.c +++ /dev/null @@ -1,45 +0,0 @@ ---- code/unix/unix_shared.c.orig Mon Aug 15 20:10:07 2005 -+++ code/unix/unix_shared.c Sun Nov 20 18:41:22 2005 -@@ -38,7 +38,7 @@ - static char cdPath[MAX_OSPATH]; - - // Used to determine local installation path --static char installPath[MAX_OSPATH]; -+static char installPath[MAX_OSPATH] = %%Q3DIR%%; - - // Used to determine where to store user-specific files - static char homePath[MAX_OSPATH]; -@@ -76,7 +76,7 @@ - return curtime; - } - --#if defined(__linux__) && !defined(DEDICATED) -+// #if defined(__linux__) && !defined(DEDICATED) - /* - ================ - Sys_XTimeToSysTime -@@ -98,11 +98,15 @@ - { - int ret, time, test; - -+ /* -+ Let's try to comment out this and see what will happen :-) -+ - if (!in_subframe->value) - { - // if you don't want to do any event times corrections - return Sys_Milliseconds(); - } -+ */ - - // test the wrap issue - #if 0 -@@ -136,7 +140,7 @@ - - return ret; - } --#endif -+// #endif - - //#if 0 // bk001215 - see snapvector.nasm for replacement - #if (defined __APPLE__) // rcg010206 - using this for PPC builds... diff --git a/games/q3cellshading/files/patch-lcc-custom.mk b/games/q3cellshading/files/patch-lcc-custom.mk deleted file mode 100644 index 8e6807919e3b..000000000000 --- a/games/q3cellshading/files/patch-lcc-custom.mk +++ /dev/null @@ -1,6 +0,0 @@ -diff -ruN ./lcc/custom.mk ../quake3-1.32b-BUILT/./lcc/custom.mk ---- ./lcc/custom.mk Wed Oct 17 23:53:10 2001 -+++ ../quake3-1.32b-BUILT/./lcc/custom.mk Mon Aug 22 20:50:29 2005 -@@ -1 +1 @@ --BUILDDIR=/tmp -+BUILDDIR=./build diff --git a/games/q3cellshading/files/patch-lcc-makefile b/games/q3cellshading/files/patch-lcc-makefile deleted file mode 100644 index f5bf35620127..000000000000 --- a/games/q3cellshading/files/patch-lcc-makefile +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ./lcc/makefile ../quake3-1.32b-BUILT/./lcc/makefile ---- ./lcc/makefile Wed Oct 17 23:53:10 2001 -+++ ../quake3-1.32b-BUILT/./lcc/makefile Mon Aug 22 20:59:15 2005 -@@ -136,7 +136,7 @@ - - $Blcc$E: $Blcc$O $Bhost$O; $(LD) $(LDFLAGS) -o $@ $Blcc$O $Bhost$O - --SYSTEM=$(shell cc -print-search-dirs | head -n 1 | cut -b 10-) -+SYSTEM=/usr/lib - - $Blcc$O: etc/lcc.c; $(CC) $(CFLAGS) -c -DTEMPDIR=\"$(TEMPDIR)\" -o $@ etc/lcc.c - $Bhost$O: $(HOSTFILE); $(CC) $(CFLAGS) -c -DSYSTEM=\"$(SYSTEM)\" -o $@ $(HOSTFILE) |