empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update nightly build for recent changes to path.c.in

Browse source 
The three previous commits touching path.c.in broke mingw.patch: the
relative vs absolute paths changes moved the initializers to be
patched to new variables, and the telfil removal messed up the
context.
This commit is contained in:
Ron Koenderink 2008-02-09 08:03:56 -06:00 • committed by Markus Armbruster
parent 83f7839d22
commit acd768e5e2
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/scripts/nightly/patches/win32.i386/mingw.patch
View file

@ -1,10 +1,7 @@
Index: empserver/src/lib/global/path.c.in diff --git a/src/lib/global/path.c.in b/src/lib/global/path.c.in
=================================================================== index a761735..77b9c50 100644
RCS file: /cvsroot/empserver/empserver/src/lib/global/path.c.in,v --- a/src/lib/global/path.c.in
retrieving revision 1.19 +++ b/src/lib/global/path.c.in
diff -u -p -r1.19 path.c.in
--- empserver/src/lib/global/path.c.in 3 Aug 2007 04:44:54 -0000 1.19
+++ empserver/src/lib/global/path.c.in 16 Dec 2007 20:11:51 -0000
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
#include "optlist.h" #include "optlist.h"
@ -14,22 +11,24 @@ diff -u -p -r1.19 path.c.in
/* /*
* Where to find configuration (absolute file name) * Where to find configuration (absolute file name)
@@ -53,15 +53,15 @@ char *custom_tables = ""; @@ -53,17 +53,17 @@ char *custom_tables = "";
char *schedulefil; char *schedulefil;
/* Where to find built-in configuration tables (relative to configdir) */ /* Where to find built-in configuration tables (relative to configdir) */
-char *builtindir = "@builtindir@"; -char *builtindir_conf = "@builtindir@";
+char *builtindir = "c:/MinGW@builtindir@"; +char *builtindir_conf = "c:/MinGW@builtindir@";
/* Where to find built-in configuration tables (absolute) */
char *builtindir;
/* Where to find info pages (relative to gamedir) */ /* Where to find info pages (relative to configdir) */
/* TODO UI wart, make it relative to configdir */ -char *infodir_conf = "@einfodir@";
-char *infodir = "@einfodir@"; +char *infodir_conf = "c:/MinGW@einfodir@";
+char *infodir = "c:/MinGW@einfodir@"; /* Where to find info pages (absolute) */
char *infodir;
/* Where this game's data is stored (relative to configdir) */ /* Where this game's data is stored (relative to configdir) */
/* FIXME relative broken in utility programs */ -char *gamedir_conf = "@gamedir@";
-char *gamedir = "@gamedir@"; +char *gamedir_conf = "c:/MinGW@gamedir@";
+char *gamedir = "c:/MinGW@gamedir@"; /* Where this game's data is stored (absolute) */
char *gamedir;
/* These are relative to gamedir: */
char teldir[] = "tel";