diff options
Diffstat (limited to 'games/quake3/files')
| -rw-r--r-- | games/quake3/files/patch-code-Construct | 15 | ||||
| -rw-r--r-- | games/quake3/files/patch-code-qcommon-common.c | 8 | ||||
| -rw-r--r-- | games/quake3/files/patch-code-unix-cons | 20 |
3 files changed, 30 insertions, 13 deletions
diff --git a/games/quake3/files/patch-code-Construct b/games/quake3/files/patch-code-Construct index 21b6c1d5ab76..e9e859985f18 100644 --- a/games/quake3/files/patch-code-Construct +++ b/games/quake3/files/patch-code-Construct @@ -1,5 +1,5 @@ ---- code/Construct Mon Aug 15 23:56:27 2005 -+++ ../../work/quake3-1.32b/code/Construct Sun Aug 28 23:13:56 2005 +--- /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct.orig Mon Aug 15 20:56:27 2005 ++++ /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct Wed Nov 23 10:37:04 2005 @@ -19,8 +19,8 @@ use Cons_gcc; @@ -11,6 +11,17 @@ $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 { diff --git a/games/quake3/files/patch-code-qcommon-common.c b/games/quake3/files/patch-code-qcommon-common.c index 94164ed41b01..9db06e6c63a5 100644 --- a/games/quake3/files/patch-code-qcommon-common.c +++ b/games/quake3/files/patch-code-qcommon-common.c @@ -1,11 +1,11 @@ -diff -ruN ./code/qcommon/common.c ../quake3-1.32b-BUILT/./code/qcommon/common.c ---- ./code/qcommon/common.c Tue Aug 16 02:10:07 2005 -+++ ../quake3-1.32b-BUILT/./code/qcommon/common.c Mon Aug 22 21:03:32 2005 -@@ -24,15 +24,7 @@ +--- 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) diff --git a/games/quake3/files/patch-code-unix-cons b/games/quake3/files/patch-code-unix-cons index 71d5fac4ad93..f62b3d8eb9ed 100644 --- a/games/quake3/files/patch-code-unix-cons +++ b/games/quake3/files/patch-code-unix-cons @@ -1,15 +1,21 @@ -diff -ruN ./code/unix/cons ../quake3-1.32b-BUILT/./code/unix/cons ---- ./code/unix/cons Fri Jun 14 15:01:32 2002 -+++ ../quake3-1.32b-BUILT/./code/unix/cons Tue Aug 23 14:21:45 2005 -@@ -271,7 +271,7 @@ +--- /work/a/ports/games/quake3/work/quake3-1.32b/code/unix/cons.orig Fri Jun 14 13:01:32 2002 ++++ /work/a/ports/games/quake3/work/quake3-1.32b/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', -+ 'CC' => 'gcc', - 'CFLAGS' => '', +- 'CFLAGS' => '', ++ 'CC' => $ENV{CC}, ++ 'CFLAGS' => $ENV{CFLAGS}, 'CCCOM' => '%CC %CFLAGS %_IFLAGS -c %< -o %>', - 'CXX' => '%CC', +- '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' => '', |