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

Jamfile optimization

This commit is contained in:
Enno Rehling 2007-05-03 11:08:51 +00:00
parent 74de05a4d3
commit 9671629f47
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/eressea/Jamfile
View File

@ -38,8 +38,9 @@ SHARED_BINDINGS =
<lua>item.cpp <lua>item.cpp
; ;
Library luabindings : $(SHARED_BINDINGS) ;
LUASERVER_SOURCES = LUASERVER_SOURCES =
$(SHARED_BINDINGS)
<common!iniparser>iniparser.c <common!iniparser>iniparser.c
<lua>script.cpp <lua>script.cpp
<lua>gamecode.cpp <lua>gamecode.cpp
@ -49,7 +50,6 @@ LUASERVER_SOURCES =
; ;
GMTOOL_SOURCES = GMTOOL_SOURCES =
$(SHARED_BINDINGS)
<common!iniparser>iniparser.c <common!iniparser>iniparser.c
<lua>gm.cpp <lua>gm.cpp
<curses>listbox.c <curses>listbox.c
@ -64,11 +64,12 @@ LinkLibraries $(SERVER) :
gamecode items spells kernel modules attributes races triggers util ; gamecode items spells kernel modules attributes races triggers util ;
libxml2 $(SERVER) ; libxml2 $(SERVER) ;
LINKLIBS on $(SERVER) += -lm ; LINKLIBS on $(SERVER) += -lm ;
Main $(SERVER) : $(SERVER_SOURCES) ; # build disabled:
# Main $(SERVER) : $(SERVER_SOURCES) ;
# eressea-server with lua scripting # eressea-server with lua scripting
LinkLibraries $(LUASERVER) : LinkLibraries $(LUASERVER) :
gamecode items spells kernel modules attributes races triggers util ; luabindings gamecode items spells kernel modules attributes races triggers util ;
luabind $(LUASERVER) ; luabind $(LUASERVER) ;
libxml2 $(LUASERVER) ; libxml2 $(LUASERVER) ;
LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ; LINKLIBS on $(LUASERVER) += -lm -ldl -lstdc++ ;
@ -76,7 +77,7 @@ Main $(LUASERVER) : $(LUASERVER_SOURCES) ;
# the curses-based GM tool (now with luabind) # the curses-based GM tool (now with luabind)
LinkLibraries $(GMTOOL) : LinkLibraries $(GMTOOL) :
items spells kernel modules attributes races triggers util ; luabindings items spells kernel modules attributes races triggers util ;
luabind $(GMTOOL) ; luabind $(GMTOOL) ;
libxml2 $(GMTOOL) ; libxml2 $(GMTOOL) ;
LINKLIBS on $(GMTOOL) += -lm -lncurses -ldl -lstdc++ ; LINKLIBS on $(GMTOOL) += -lm -lncurses -ldl -lstdc++ ;

14
src/eressea/gmtool.c
View File

@ -296,20 +296,6 @@ mr_get(const view * vi, int xofs, int yofs)
return vi->regions + xofs + yofs * vi->size.width; return vi->regions + xofs + yofs * vi->size.width;
} }
static coordinate *
point2coor(const point * p, coordinate * c)
{
int x, y;
assert(p && c);
/* wegen division (-1/2==0):
* verschiebung um (0x200000,0x200000) ins positive */
x = p->x + TWIDTH*0x200000+TWIDTH*0x100000;
y = p->y + THEIGHT*0x200000;
c->x = (x - y * TWIDTH / 2) / TWIDTH - 0x200000;
c->y = y / THEIGHT - 0x200000;
return c;
}
static point * static point *
coor2point(const coordinate * c, point * p) coor2point(const coordinate * c, point * p)
{ {