forked from github/server
fixing directories and stuff.
This commit is contained in:
parent
e8363b41cf
commit
275476aaf6
|
@ -6,5 +6,5 @@
|
||||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||||
<rewriteURI
|
<rewriteURI
|
||||||
uriStartString="eressea:///core/"
|
uriStartString="eressea:///core/"
|
||||||
rewritePrefix="../../res/" />
|
rewritePrefix="../../server/res/" />
|
||||||
</catalog>
|
</catalog>
|
||||||
|
|
|
@ -6,5 +6,5 @@
|
||||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||||
<rewriteURI
|
<rewriteURI
|
||||||
uriStartString="eressea:///core/"
|
uriStartString="eressea:///core/"
|
||||||
rewritePrefix="../../res/" />
|
rewritePrefix="../../server/res/" />
|
||||||
</catalog>
|
</catalog>
|
||||||
|
|
|
@ -12,8 +12,9 @@
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <wctype.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 * entry_point = NULL;
|
||||||
|
static const char * inifile = "eressea.ini";
|
||||||
static int memdebug = 0;
|
static int memdebug = 0;
|
||||||
|
|
||||||
static void parse_config(const char * filename)
|
static void parse_config(const char * filename)
|
||||||
|
@ -231,7 +232,7 @@ int main(int argc, char ** argv)
|
||||||
|
|
||||||
log_open("eressea.log");
|
log_open("eressea.log");
|
||||||
locale_init();
|
locale_init();
|
||||||
parse_config("eressea.ini");
|
parse_config(inifile);
|
||||||
|
|
||||||
err = parse_args(argc, argv);
|
err = parse_args(argc, argv);
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
Loading…
Reference in New Issue