Archives
Archives
| From: | "Tony Vroon (chainsaw)" <chainsaw@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in games-arcade/opentyrian/files: 20091025-datapath.diff 20091025-cflag-idiocy.diff |
| Date: | Sun, 25 Oct 2009 19:06:01 |
| Message-Id: | E1N28PZ-0002Zm-55@stork.gentoo.org |
| 1 | chainsaw 09/10/25 19:05:53 |
| 2 | |
| 3 | Added: 20091025-datapath.diff 20091025-cflag-idiocy.diff |
| 4 | Log: |
| 5 | Version bump; upstream switched from subversion to mercurial. The build system has changed and now needs to be fought to a degree where a debug USE-flag is no longer feasible. |
| 6 | (Portage version: 2.2_rc46/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 games-arcade/opentyrian/files/20091025-datapath.diff |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/opentyrian/files/20091025-datapath.diff?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/opentyrian/files/20091025-datapath.diff?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: 20091025-datapath.diff |
| 15 | =================================================================== |
| 16 | diff -uNr opentyrian.ORIG/Makefile opentyrian/Makefile |
| 17 | --- opentyrian.ORIG/Makefile 2009-10-25 00:45:41.958937396 +0100 |
| 18 | +++ opentyrian/Makefile 2009-10-25 00:47:31.759940038 +0100 |
| 19 | @@ -73,6 +73,10 @@ |
| 20 | CFLAGS += -DHG_REV='"$(HG_REV)"' |
| 21 | endif |
| 22 | |
| 23 | +ifneq ($(DATA_PATH), ) |
| 24 | + CFLAGS += -DDATA_PATH=\"$(DATA_PATH)\" |
| 25 | +endif |
| 26 | + |
| 27 | # RULES #################################################### |
| 28 | |
| 29 | .PHONY : all |
| 30 | diff -uNr opentyrian.ORIG/src/file.c opentyrian/src/file.c |
| 31 | --- opentyrian.ORIG/src/file.c 2009-10-25 00:45:41.967228200 +0100 |
| 32 | +++ opentyrian/src/file.c 2009-10-25 00:50:21.542979700 +0100 |
| 33 | @@ -34,7 +34,7 @@ |
| 34 | #ifdef TARGET_MACOSX |
| 35 | tyrian_game_folder(), |
| 36 | #endif |
| 37 | - "/usr/share/opentyrian/data" |
| 38 | + DATA_PATH |
| 39 | }; |
| 40 | |
| 41 | static const char *dir = NULL; |
| 42 | |
| 43 | |
| 44 | |
| 45 | 1.1 games-arcade/opentyrian/files/20091025-cflag-idiocy.diff |
| 46 | |
| 47 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/opentyrian/files/20091025-cflag-idiocy.diff?rev=1.1&view=markup |
| 48 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/opentyrian/files/20091025-cflag-idiocy.diff?rev=1.1&content-type=text/plain |
| 49 | |
| 50 | Index: 20091025-cflag-idiocy.diff |
| 51 | =================================================================== |
| 52 | --- opentyrian/Makefile.orig 2009-10-25 00:52:54.401229746 +0100 |
| 53 | +++ opentyrian/Makefile 2009-10-25 00:54:37.642954736 +0100 |
| 54 | @@ -49,9 +49,6 @@ |
| 55 | |
| 56 | # FLAGS #################################################### |
| 57 | |
| 58 | -NDEBUG_FLAGS := -g0 -O2 -DNDEBUG |
| 59 | -DEBUG_FLAGS := -g3 -O0 -Werror |
| 60 | - |
| 61 | CFLAGS += --std=c99 -pedantic -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers |
| 62 | CFLAGS += -I./src -I$(INCLUDEDIR) |
| 63 | LDFLAGS += -L$(LIBDIR) -lm |