Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing directories and stuff.

This commit is contained in:
Enno Rehling 2010-03-08 23:16:11 -08:00
parent e8363b41cf
commit 275476aaf6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/catalog-e3a.xml
View File

@ -6,5 +6,5 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI
uriStartString="eressea:///core/"
rewritePrefix="../../res/" />
rewritePrefix="../../server/res/" />
</catalog>

2
res/catalog-eressea.xml
View File

@ -6,5 +6,5 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI
uriStartString="eressea:///core/"
rewritePrefix="../../res/" />
rewritePrefix="../../server/res/" />
</catalog>

5
src/main.c
View File

@ -12,8 +12,9 @@
#include <locale.h>
#include <wctype.h>
static const char * luafile = "init.lua";
static const char * luafile = "setup.lua";
static const char * entry_point = NULL;
static const char * inifile = "eressea.ini";
static int memdebug = 0;
static void parse_config(const char * filename)
@ -231,7 +232,7 @@ int main(int argc, char ** argv)
log_open("eressea.log");
locale_init();
parse_config("eressea.ini");
parse_config(inifile);
err = parse_args(argc, argv);
if (err) {