| 1 |
tupone 12/04/30 08:35:46 |
| 2 |
|
| 3 |
Added: egoboo-2.8.1-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump to 2.8.1 Bug #366731 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.57/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: egoboo-2.8.1-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- src/game/platform/file_linux.c.old 2012-04-29 21:45:29.627419281 +0200 |
| 18 |
+++ src/game/platform/file_linux.c 2012-04-29 21:45:29.628419211 +0200 |
| 19 |
@@ -79,9 +79,9 @@ |
| 20 |
strncpy( linux_dataPath, PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) ); |
| 21 |
#else |
| 22 |
// these are read-only directories |
| 23 |
- strncpy( linux_configPath, "/etc/egoboo-2.x/", SDL_arraysize( linux_configPath ) ); |
| 24 |
+ strncpy( linux_configPath, "@GENTOO_CONFDIR@", SDL_arraysize( linux_configPath ) ); |
| 25 |
strncpy( linux_binaryPath, "/games/", SDL_arraysize( linux_binaryPath ) ); |
| 26 |
- strncpy( linux_dataPath, "/share/games/egoboo-2.x/", SDL_arraysize( linux_dataPath ) ); |
| 27 |
+ strncpy( linux_dataPath, "@GENTOO_DATADIR@", SDL_arraysize( linux_dataPath ) ); |
| 28 |
#endif |
| 29 |
|
| 30 |
// the log file cannot be started until there is a user data path to dump the file into |
| 31 |
--- src/game/network.c.old 2012-04-29 20:14:31.482179973 +0200 |
| 32 |
+++ src/game/network.c 2012-04-29 20:14:52.077730184 +0200 |
| 33 |
@@ -37,7 +37,7 @@ |
| 34 |
#include "egoboo_setup.h" |
| 35 |
#include "egoboo.h" |
| 36 |
|
| 37 |
-#include "enet/enet.h" |
| 38 |
+#include <enet/enet.h> |
| 39 |
#include "file_common.h" |
| 40 |
|
| 41 |
#include <stdarg.h> |
| 42 |
--- src/game/Makefile.old 2012-04-29 20:17:09.303070070 +0200 |
| 43 |
+++ src/game/Makefile 2012-04-29 20:18:21.047023847 +0200 |
| 44 |
@@ -33,8 +33,7 @@ |
| 45 |
# the compiler options |
| 46 |
|
| 47 |
-CC := gcc |
| 48 |
-INC := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions -I./file_formats -I./platform |
| 49 |
-LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet |
| 50 |
+INC := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform |
| 51 |
+LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet -lm |
| 52 |
|
| 53 |
# use different options if the environmental variable PREFIX is defined |
| 54 |
ifdef ($(PREFIX),"") |
| 55 |
@@ -43,7 +43,7 @@ |
| 56 |
OPT := -Os -Wall -DPREFIX=\"${PREFIX}\" -D_NIX_PREFIX |
| 57 |
endif |
| 58 |
|
| 59 |
-CFLAGS := ${OPT} ${INC} |
| 60 |
+CFLAGS += ${INC} -DENET11 |
| 61 |
|
| 62 |
#------------------------------------ |
| 63 |
# definitions of the target projects |
| 64 |
@@ -52,7 +52,7 @@ |
| 65 |
all: ${EGO_BIN} |
| 66 |
|
| 67 |
${EGO_BIN}: ${EGO_OBJ} |
| 68 |
- ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} |
| 69 |
+ ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS} |
| 70 |
|
| 71 |
clean: |
| 72 |
rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN} |
Archives