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

kleiner fix

This commit is contained in:
Enno Rehling 2004-01-24 00:18:49 +00:00
parent 9fbe85c618
commit 96c5ae33fa
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/eressea/Jamfile
View File

@ -7,16 +7,11 @@ SubDirHdrs $(SUBDIR)/../common/util ;
SubDirHdrs $(SUBDIR)/../common ; SubDirHdrs $(SUBDIR)/../common ;
SubDirHdrs $(SUBDIR)/.. ; SubDirHdrs $(SUBDIR)/.. ;
if $(HAVE_LUA) { LUASERVER = eressea-lua ;
SubDirC++Flags -DHAVE_LUA ; SERVER = eressea ;
UsingLua ;
UsingLuabind ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ;
}
if $(HAVE_LUA) { SERVER_SOURCES = main.c korrektur.c ;
BINARY = eressea-lua ; LUASERVER_SOURCES =
SOURCES =
<lua>alliance.cpp <lua>alliance.cpp
<lua>building.cpp <lua>building.cpp
<lua>eressea.cpp <lua>eressea.cpp
@ -25,29 +20,25 @@ if $(HAVE_LUA) {
<lua>ship.cpp <lua>ship.cpp
<lua>unit.cpp <lua>unit.cpp
server.cpp server.cpp
korrektur.c
; ;
LINKLIBS on $(BINARY) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ; LinkLibraries $(SERVER) :
LINKLIBS on $(BINARY) += -lluabind ; kernel gamecode items modules attributes spells races triggers util ;
LINKLIBS on $(BINARY) += -ldl -lstdc++ ; LinkLibraries $(LUASERVER) :
} else { kernel gamecode items modules attributes spells races triggers util ;
BINARY = eressea ;
SOURCES = main.c ; LINKLIBS on $(SERVER) += -lm ;
LINKLIBS on $(LUASERVER) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
LINKLIBS on $(LUASERVER) += -lm -lluabind -ldl -lstdc++ ;
if $(HAVE_LUA) {
SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ;
SubDirC++Flags -DHAVE_LUA ;
UsingLua ;
UsingLuabind ;
Main $(LUASERVER) : $(LUASERVER_SOURCES) ;
} }
SOURCES += korrektur.c ; Main $(SERVER) : $(SERVER_SOURCES) ;
Main $(BINARY) : $(SOURCES) ;
LinkLibraries $(BINARY) :
kernel
gamecode
items
modules
attributes
spells
races
triggers
util
;
LINKLIBS on $(BINARY) += -lm ;

3
src/scripts/default.lua
View File

@ -18,8 +18,6 @@ function process(orders)
write_passwords() write_passwords()
write_reports() write_reports()
print(turn .. " " .. get_turn())
file = "" .. get_turn() file = "" .. get_turn()
if write_game(file)~=0 then if write_game(file)~=0 then
print("could not write game") print("could not write game")
@ -38,3 +36,4 @@ if orderfile==nil then
else else
process(orderfile) process(orderfile)
end end