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

jamrules und fixes, damit die kranke uni-installation klappt

This commit is contained in:
Enno Rehling 2005-05-08 17:32:01 +00:00
parent 6eb123d6cc
commit 64a85e8138
3 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Jamrules
View File

@ -1,15 +1,17 @@
C++ = g++ ; C++ = g++ ;
CC = gcc ; CC = gcc ;
if $(JAMUNAME[5]) = "GNU/Linux" {
DEBIAN = 1 ;
}
LINKFLAGS += -rdynamic ; LINKFLAGS += -rdynamic ;
if ! $(HAVE_LUA) { if ! $(HAVE_LUA) {
HAVE_LUA = 1 ; HAVE_LUA = 1 ;
} }
if ! $(DISTCC_HOSTS) { if $(DISTCC_HOSTS) {
}
else {
DISTCC = 1 ; DISTCC = 1 ;
} }
@ -53,8 +55,11 @@ if ! $(LUABIND) {
} }
C++FLAGS += -DHAVE_LUABIND_$(LUABIND) ; C++FLAGS += -DHAVE_LUABIND_$(LUABIND) ;
if $(HOST) = "hamunaptra" { if $(LOCAL_USR) {
XMLHDRS = /homes2/info-f/enno/software/hamunaptra/include/libxml2 ; XMLHDRS = $(LOCAL_USR)/include/libxml2 ;
C++FLAGS += -I$(LOCAL_USR)/include ;
CFLAGS += -I$(LOCAL_USR)/include ;
LINKLIBS += -L$(LOCAL_USR)/lib ;
} else { } else {
XMLHDRS = /usr/include/libxml2 ; XMLHDRS = /usr/include/libxml2 ;
} }
@ -70,10 +75,10 @@ rule iconv
rule luabind rule luabind
{ {
LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib ; LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib ;
if $(HOST) = "hamunaptra" { if $(DEBIAN) {
LINKLIBS on $(<) += -llua -llualib ;
} else {
LINKLIBS on $(<) += -llua50 -llualib50 ; LINKLIBS on $(<) += -llua50 -llualib50 ;
} else {
LINKLIBS on $(<) += -llua -llualib ;
} }
LINKLIBS on $(<) += -lm -lluabind ; LINKLIBS on $(<) += -lm -lluabind ;
} }

4
src/config.h
View File

@ -226,7 +226,9 @@ extern char * strdup(const char *s);
/**** **** /**** ****
** The Eressea boolean type ** ** The Eressea boolean type **
**** ****/ **** ****/
#ifndef HAS_BOOLEAN #ifdef __cplusplus
typedef bool boolean;
#else
typedef int boolean; typedef int boolean;
# define false ((boolean)0) # define false ((boolean)0)
# define true ((boolean)!false) # define true ((boolean)!false)

20
src/eressea/main.c
View File

@ -220,23 +220,6 @@ game_init(void)
#endif #endif
} }
static void
getgarbage(void)
{
faction *f;
/* Get rid of stuff that was only relevant last turn */
#if 0
for (r = regions; r; r = r->next) {
freestrlist(r->comments);
r->comments = 0;
freestrlist(r->botschaften);
r->botschaften = 0;
}
#endif
}
#ifdef SHORTPWDS #ifdef SHORTPWDS
static void static void
readshortpwds() readshortpwds()
@ -287,9 +270,6 @@ processturn(char *filename)
printf(" - Korrekturen Runde %d\n", turn); printf(" - Korrekturen Runde %d\n", turn);
korrektur(); korrektur();
turn++; turn++;
puts(" - entferne Texte der letzten Runde");
getgarbage();
puts(" - Nehme Korrekturen am Datenbestand vor");
if ((i=readorders(filename))!=0) return i; if ((i=readorders(filename))!=0) return i;
if (!nomonsters) { if (!nomonsters) {
if (turn == 0) srand(time((time_t *) NULL)); if (turn == 0) srand(time((time_t *) NULL));