diff -ur tomenet-2006-07-16/src/common/w_z_pack.c tomenet-normal-server-compile/src/common/w_z_pack.c --- tomenet-2006-07-16/src/common/w_z_pack.c 2006-07-11 15:38:04.000000000 +0300 +++ tomenet-normal-server-compile/src/common/w_z_pack.c 2006-07-16 15:42:56.000000000 +0300 @@ -1,6 +1,6 @@ /* ** Lua binding: z_pack -** Generated automatically by tolua 4.0a - angband on Tue Jul 11 14:38:03 2006. +** Generated automatically by tolua 4.0a - angband on Sun Jul 16 15:42:54 2006. */ #include "lua/tolua.h" diff -ur tomenet-2006-07-16/src/h-config.h tomenet-normal-server-compile/src/h-config.h --- tomenet-2006-07-16/src/h-config.h 2002-06-15 19:33:02.000000000 +0300 +++ tomenet-normal-server-compile/src/h-config.h 2006-07-16 15:40:46.000000000 +0300 @@ -184,7 +184,7 @@ # if defined(SYS_III) || defined(SYS_V) || defined(SOLARIS) || \ defined(HPUX) || defined(SGI) || defined(ATARI) # ifndef USG -# define USG +//# define USG # endif # endif #endif diff -ur tomenet-2006-07-16/src/makefile tomenet-normal-server-compile/src/makefile --- tomenet-2006-07-16/src/makefile 2006-07-16 14:53:46.000000000 +0300 +++ tomenet-normal-server-compile/src/makefile 2006-07-16 15:35:38.000000000 +0300 @@ -208,12 +208,10 @@ ## Variation -- FreeBSD 4.3R ## #PREFIX = /usr/local -## -Wuninitialized is included in -Wall -#CFLAGS = -g -pipe -Wall -Wuninitialized -D"USE_X11" -D"USE_GCU" -I${X11BASE}/include -DDEFAULT_PATH="\"./lib\"" -O3 -CFLAGS = -g -pipe -Wall -D"USE_X11" -D"USE_GCU" -I${X11BASE}/include -DDEFAULT_PATH="\"./lib\"" -O3 -Wmissing-declarations -Wnested-externs -#CFLAGS = -g -pipe -Wall -Wuninitialized -D"USE_X11" -D"USE_GCU" -I${X11BASE}/include -DDEFAULT_PATH="\"./lib\"" -O3 -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -#-Werror +CFLAGS = -g -pipe -Wall -D"USE_GCU" -DDEFAULT_PATH="\"./lib\"" -O3 LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm +LIBS2 = -lncurses -lcrypt +LIBS3 = -lcrypt ## @@ -347,16 +345,16 @@ TOLUA = server/tolua #all: tomenet tomenet.console tomenet.server accedit evilmeta -all: tomenet.server accedit evilmeta +all: tomenet.server.exe accedit.exe evilmeta.exe # sorry. install on every make is a real pain ;) install: all # install -b tomenet .. # install -b tomenet.console .. - install -b tomenet.server .. - install -b accedit .. - install -b evilmeta .. + install -b tomenet.server.exe .. + install -b accedit.exe .. + install -b evilmeta.exe .. touch ../tomenet.acc @@ -371,41 +369,41 @@ # touch client/main-gcu.c touch console/c-init.c -accedit: account/accedit.o - $(CC) $(CFLAGS) -o accedit account/accedit.o -lcurses -lcrypt +accedit.exe: account/accedit.o + $(CC) $(CFLAGS) -o accedit.exe account/accedit.o -lncurses -lcrypt # # Build the "MAngband" server # -tomenet.server: $(SERV_OBJS) $(TOLUA) - $(CC) $(CFLAGS) -o tomenet.server $(SERV_OBJS) $(LDFLAGS) $(LIBS) +tomenet.server.exe: $(SERV_OBJS) $(TOLUA) + $(CC) $(CFLAGS) -o tomenet.server.exe $(SERV_OBJS) $(LDFLAGS) $(LIBS3) # # Evileye meta client # -evilmeta: server/evilmeta.o - $(CC) $(CFLAGS) -o evilmeta server/evilmeta.c +evilmeta.exe: server/evilmeta.o + $(CC) $(CFLAGS) -o evilmeta.exe server/evilmeta.c # # Build the "MAngband" client # -tomenet: $(CLI_OBJS) - $(CC) $(CFLAGS) -o tomenet $(CLI_OBJS) $(LDFLAGS) $(LIBS) +tomenet.exe: $(CLI_OBJS) + $(CC) $(CFLAGS) -o tomenet.exe $(CLI_OBJS) $(LDFLAGS) $(LIBS) # # Build the "MAngband" remote console # -tomenet.console: $(CONS_OBJS) - $(CC) $(CFLAGS) -o tomenet.console $(CONS_OBJS) $(LDFLAGS) $(LIBS) +tomenet.console.exe: $(CONS_OBJS) + $(CC) $(CFLAGS) -o tomenet.console.exe $(CONS_OBJS) $(LDFLAGS) $(LIBS2) $(TOLUA): $(TOLUAOBJS) server/lua/tolua.c server/lua/tolualua.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) server/lua/tolua.c server/lua/tolualua.c $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) server/lua/tolua.c server/lua/tolualua.c # # Rule for making a '.o' diff -ur tomenet-2006-07-16/src/server/party.c tomenet-normal-server-compile/src/server/party.c --- tomenet-2006-07-16/src/server/party.c 2006-07-04 23:12:10.000000000 +0300 +++ tomenet-normal-server-compile/src/server/party.c 2006-07-16 15:31:08.000000000 +0300 @@ -8,6 +8,8 @@ #include "../world/world.h" +#include + /* * Give some exp-bonus to encourage partying (aka "C.Blue party bonus") [2] * formula: (PARTY_XP_BOOST+1)/(PARTY_XP_BOOST + (# of applicable players)) diff -ur tomenet-2006-07-16/src/server/sched.c tomenet-normal-server-compile/src/server/sched.c --- tomenet-2006-07-16/src/server/sched.c 2006-07-04 23:48:42.000000000 +0300 +++ tomenet-normal-server-compile/src/server/sched.c 2006-07-16 15:31:08.000000000 +0300 @@ -33,6 +33,8 @@ #include #endif /* WINDOWS */ +#include + /*char sched_version[] = VERSION;*/ #ifdef sony_news diff -ur tomenet-2006-07-16/src/server/util.c tomenet-normal-server-compile/src/server/util.c --- tomenet-2006-07-16/src/server/util.c 2006-06-25 01:45:26.000000000 +0300 +++ tomenet-normal-server-compile/src/server/util.c 2006-07-16 15:31:08.000000000 +0300 @@ -3,6 +3,7 @@ /* Purpose: Angband utilities -BEN- */ +#include #define SERVER