diff options
| author | danfe <danfe@FreeBSD.org> | 2009-12-05 23:04:34 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2009-12-05 23:04:34 +0800 |
| commit | 1612633752f5e2f3088b9e12a5fb4176afe0f507 (patch) | |
| tree | dd5ef66186219ff328ec0125ae1a9796d6d5aa43 /games/warsow/files | |
| parent | dcb881c96ad043348c750cdf29be63b201860d36 (diff) | |
| download | freebsd-ports-gnome-1612633752f5e2f3088b9e12a5fb4176afe0f507.tar.gz freebsd-ports-gnome-1612633752f5e2f3088b9e12a5fb4176afe0f507.tar.zst freebsd-ports-gnome-1612633752f5e2f3088b9e12a5fb4176afe0f507.zip | |
- Belatedly update to version 0.5
- Offer to install community map pack (on by default)
- Convert one patch file to simple inplace editing
Diffstat (limited to 'games/warsow/files')
| -rw-r--r-- | games/warsow/files/patch-Makefile | 31 | ||||
| -rw-r--r-- | games/warsow/files/patch-game+q_shared.h | 42 |
2 files changed, 11 insertions, 62 deletions
diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile index bf817c08763e..1df4f1a2be90 100644 --- a/games/warsow/files/patch-Makefile +++ b/games/warsow/files/patch-Makefile @@ -1,8 +1,8 @@ ---- Makefile.orig 2006-06-08 22:44:02.000000000 +0200 -+++ Makefile 2008-04-11 13:18:40.000000000 +0200 -@@ -34,19 +34,12 @@ - CC=i586-mingw32msvc-gcc - LD=i586-mingw32msvc-gcc +--- Makefile.orig ++++ Makefile +@@ -51,19 +51,12 @@ + #CC=gcc + #LD=gcc else -CC?=gcc -LD=gcc @@ -23,7 +23,7 @@ SHARED_LIBRARY_EXTENSION=so endif -@@ -134,7 +127,7 @@ +@@ -161,7 +154,7 @@ LIB=lib endif @@ -32,25 +32,16 @@ LDFLAGS_DED=-lz $(shell curl-config --libs) LDFLAGS_MODULE=-shared LDFLAGS_TV_SERVER=-lz -@@ -149,11 +142,7 @@ - - # sdl - ifeq ($(BUILD_SND_QF),YES) --ifeq ($(OS),FreeBSD) --SDL_CONFIG?=sdl11-config --else - SDL_CONFIG?=sdl-config --endif - - CFLAGS_SDL=$(shell $(SDL_CONFIG) --cflags) - LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile -@@ -193,8 +182,7 @@ +@@ -217,10 +210,8 @@ ###################################################################################################### # Helper functions ###################################################################################################### -DO_CC=echo " > Compiling $<" && \ - $(CC) $(CFLAGS_COMMON) -c $< -o $@ +-DO_CXX=echo " > Compiling (c++) $<" && \ +- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ +DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@ ++DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ + DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT) - DO_CC_DED=$(DO_CC) $(CFLAGS_DED) diff --git a/games/warsow/files/patch-game+q_shared.h b/games/warsow/files/patch-game+q_shared.h deleted file mode 100644 index f5d6e16df096..000000000000 --- a/games/warsow/files/patch-game+q_shared.h +++ /dev/null @@ -1,42 +0,0 @@ ---- game/q_shared.h.orig 2008-07-24 05:38:24.000000000 +0700 -+++ game/q_shared.h 2008-07-24 05:41:08.000000000 +0700 -@@ -98,15 +98,15 @@ - #ifdef _M_IX86 - #if defined __FreeBSD__ - #define CPUSTRING "i386" --#define ARCH "freebsd_i386" -+#define ARCH "i386" - #else - #define CPUSTRING "x86" - #define ARCH "x86" - #endif - #elif defined ( _M_AMD64 ) - #if defined __FreeBSD__ --#define CPUSTRING "x86_64" --#define ARCH "freebsd_x86_64" -+#define CPUSTRING "amd64" -+#define ARCH "amd64" - #else - #define CPUSTRING "x64" - #define ARCH "x64" -@@ -162,17 +162,12 @@ - #endif - - #ifdef __i386__ --#if defined __FreeBSD__ --#define ARCH "freebsd_i386" --#define CPUSTRING "i386" --#else - #define ARCH "i386" - #define CPUSTRING "i386" --#endif --#elif defined ( __x86_64__ ) -+#elif defined ( __x86_64__ ) || defined( __amd64__ ) - #if defined __FreeBSD__ --#define ARCH "freebsd_x86_64" --#define CPUSTRING "x86_64" -+#define ARCH "amd64" -+#define CPUSTRING "amd64" - #else - #define ARCH "x86_64" - #define CPUSTRING "x86_64" |