diff -ru xtank-north-0.2/Imakefile.Config xtank-north-0.2-fixed/Imakefile.Config --- xtank-north-0.2/Imakefile.Config 2001-01-12 17:30:04.000000000 +1100 +++ xtank-north-0.2-fixed/Imakefile.Config 2008-07-07 09:06:05.000000000 +1000 @@ -170,7 +170,7 @@ /**/# /**/# Everybody needs to know the following global things about xtank -DEFINES2 = -DX11 -DUNIX -DS800x600 -DKEYPAD_DETECT \ +DEFINES2 = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT \ -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS \ -DBATCH_COLOR_LINES \ -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) diff -ru xtank-north-0.2/Makefile xtank-north-0.2-fixed/Makefile --- xtank-north-0.2/Makefile 2004-08-21 10:28:23.000000000 +1000 +++ xtank-north-0.2-fixed/Makefile 2008-07-07 09:55:31.000000000 +1000 @@ -810,12 +810,12 @@ # # Everybody needs to know the following global things about xtank -DEFINES2 = -DX11 -DUNIX -DS800x600 -DKEYPAD_DETECT -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS -DBATCH_COLOR_LINES -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) +DEFINES2 = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS -DBATCH_COLOR_LINES -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) # Edited for Debian GNU/Linux. DESTDIR = -DEFINES = -DXTANK_DIR=\"$(DESTDIR)/usr/games/xtank\" $(DEFINES2) -DALLDEFINES="\"$(DEFINES2)\"" +DEFINES = -DXTANK_DIR=\"$(DESTDIR)/tmp/x\" $(DEFINES2) -DALLDEFINES="\"$(DEFINES2)\"" # Things that might need to be defined, for your particular machine # architecture, and installation of xtank. The best place to add @@ -875,9 +875,11 @@ # Start of System Dependent Things # (e.g. special options for your particular hardware and installation) - ARCH_DEFINES = -DMULTI_SYNC -DTHREAD_MP -DDYNALOAD -Dconst="" + ARCH_DEFINES = -DMULTI_SYNC -DDYNALOAD -Dconst="" +# ARCH_DEFINES = -DMULTI_SYNC -DTHREAD_MP -DDYNALOAD -Dconst="" XTANK_TARGET = xtank.linux CDEBUGFLAGS = -O3 +# CC = gcc-2.95 CC = cc # End of System Dependent Things diff -ru xtank-north-0.2/Src/Makefile xtank-north-0.2-fixed/Src/Makefile --- xtank-north-0.2/Src/Makefile 2004-08-21 10:28:23.000000000 +1000 +++ xtank-north-0.2-fixed/Src/Makefile 2008-07-07 10:09:58.000000000 +1000 @@ -811,12 +811,12 @@ # # Everybody needs to know the following global things about xtank -DEFINES2 = -DX11 -DUNIX -DS800x600 -DKEYPAD_DETECT -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS -DBATCH_COLOR_LINES -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) +DEFINES2 = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS -DBATCH_COLOR_LINES -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) # Edited for Debian GNU/Linux. DESTDIR = -DEFINES = -DXTANK_DIR=\"$(DESTDIR)/usr/games/xtank\" $(DEFINES2) -DALLDEFINES="\"$(DEFINES2)\"" +DEFINES = -DXTANK_DIR=\"$(DESTDIR)/tmp/x\" $(DEFINES2) -DALLDEFINES="\"$(DEFINES2)\"" # Things that might need to be defined, for your particular machine # architecture, and installation of xtank. The best place to add @@ -876,7 +876,7 @@ # Start of System Dependent Things # (e.g. special options for your particular hardware and installation) - ARCH_DEFINES = -DMULTI_SYNC -DTHREAD_MP -DDYNALOAD -Dconst="" + ARCH_DEFINES = -DMULTI_SYNC -DDYNALOAD -Dconst="" XTANK_TARGET = xtank.linux CDEBUGFLAGS = -O3 CC = cc @@ -902,14 +902,14 @@ # Everybody needs the following libraries - EXTRA_LIBRARIES = -LPrograms -lxtankrobots -lm + EXTRA_LIBRARIES = -lm # Start of System Dependent Things # (e.g. libraries, linker flags and so forth) # End of System Dependent Things - SUBDIRS = Programs + SUBDIRS = all:: @for flag in ${MAKEFLAGS} ''; do \ diff -ru xtank-north-0.2/Src/program.c xtank-north-0.2-fixed/Src/program.c --- xtank-north-0.2/Src/program.c 2001-01-07 15:46:48.000000000 +1100 +++ xtank-north-0.2-fixed/Src/program.c 2008-07-07 10:11:49.000000000 +1000 @@ -153,35 +153,8 @@ init_prog_descs() { int iCtr; - extern Prog_desc - kamikaze_prog, drone_prog, warrior_prog, shooter_prog, eliza_prog, - Buddy_prog, Flipper_prog, artful_prog, spot_prog, Diophantine_prog, - hud3_prog, Dio_prog, /* New with 1.2g & not all that tested: */ - Pzkw_I_prog, dum_maze_prog, roadrunner_prog, - Guard_prog, RacerX_prog, /* New with 1.3b & extensively tested */ - tagman_prog, Bootlegger_prog, gnat_prog; num_prog_descs = 0; - prog_desc[num_prog_descs++] = &kamikaze_prog; - prog_desc[num_prog_descs++] = &drone_prog; - prog_desc[num_prog_descs++] = &warrior_prog; - prog_desc[num_prog_descs++] = &shooter_prog; - prog_desc[num_prog_descs++] = &eliza_prog; - prog_desc[num_prog_descs++] = &Buddy_prog; - prog_desc[num_prog_descs++] = &Flipper_prog; - prog_desc[num_prog_descs++] = &Diophantine_prog; - prog_desc[num_prog_descs++] = &artful_prog; - prog_desc[num_prog_descs++] = &spot_prog; - prog_desc[num_prog_descs++] = &hud3_prog; - prog_desc[num_prog_descs++] = &Dio_prog; - prog_desc[num_prog_descs++] = &Pzkw_I_prog; - prog_desc[num_prog_descs++] = &dum_maze_prog; - prog_desc[num_prog_descs++] = &roadrunner_prog; - prog_desc[num_prog_descs++] = &Guard_prog; - prog_desc[num_prog_descs++] = &RacerX_prog; - prog_desc[num_prog_descs++] = &tagman_prog; - prog_desc[num_prog_descs++] = &Bootlegger_prog; - prog_desc[num_prog_descs++] = &gnat_prog; for (iCtr = 0; iCtr < num_prog_descs; iCtr++) { diff -ru xtank-north-0.2/Src/thread.c xtank-north-0.2-fixed/Src/thread.c --- xtank-north-0.2/Src/thread.c 2001-01-09 00:13:17.000000000 +1100 +++ xtank-north-0.2-fixed/Src/thread.c 2008-07-07 09:46:48.000000000 +1000 @@ -269,7 +269,7 @@ #ifdef linux /* Stack grows downwards. Align to 32-bit boundary */ - thd->state->__jmpbuf[JB_SP] = bufend & ~3; + // thd->state->__jmpbuf[JB_SP] = bufend & ~3; #endif #if defined(sequent) && defined(i386)