Working well enough for Manic Miner now...

1 files changed, 82 insertions, 36 deletions

diff --git a/src/Makefile b/src/Makefile
index a0c3354..4dfec79 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,7 @@
 # 
 # -------------------------------------------------------------------------
 # 
-# $Id: Makefile,v 1.11 2004-08-27 23:55:16 ianc Exp $
+# $Id: Makefile,v 1.12 2006-09-11 00:35:48 ianc Exp $
 # 
 
 
@@ -31,8 +31,6 @@ CFLAGS	=	-g -Wall -Werror -pedantic -ansi -O2
 
 TARGET	=	espec
 
-Z80LIB	=	z80/z80.a
-
 SOURCE	=	main.c		\
 		spec.c		\
 		snap.c		\
@@ -42,7 +40,11 @@ SOURCE	=	main.c		\
 		memmenu.c	\
 		util.c		\
 		kbbmp.c		\
-		exit.c
+		exit.c		\
+		expr.c		\
+		z80.c		\
+		z80_decode.c	\
+		z80_dis.c
 
 OBJECTS	=	main.o		\
 		spec.o		\
@@ -53,34 +55,33 @@ OBJECTS	=	main.o		\
 		memmenu.o	\
 		util.o		\
 		kbbmp.o		\
-		exit.o
+		exit.o		\
+		expr.o		\
+		z80.o		\
+		z80_decode.o	\
+		z80_dis.o
 
-CFLAGS +=	-Iz80 `sdl-config --cflags`
+CFLAGS +=	`sdl-config --cflags` -DENABLE_DISASSEM
 
-LIBS	=	$(Z80LIB) `sdl-config --libs`
-#LIBS	=	$(Z80LIB) `sdl-config --static-libs` -lncurses -lX11
+LIBS	=	`sdl-config --libs`
 
-$(TARGET): $(OBJECTS) $(Z80LIB)
+$(TARGET): $(OBJECTS) 
 	$(CC) $(CFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
 
-$(Z80LIB): z80/*.[ch]
-	cd z80; make "EXTERNAL_CFLAGS=`sdl-config --cflags`" ; cd ..
-
 clean:
 	rm -f $(TARGET) $(TARGET).exe $(OBJECTS) core
-	cd z80; make clean; cd ..
 
 depend:
 	makedepend  -- $(CFLAGS) -- $(SOURCE)
 	if test -e Makefile ; then rm -f Makefile.bak ; fi
-	cd z80; make depend ; cd ..
 
 # DO NOT DELETE THIS LINE -- make depend depends on it
 
 main.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-main.o: /usr/include/machine/ansi.h /usr/include/stdio.h
-main.o: /usr/include/string.h /usr/local/include/SDL11/SDL.h
-main.o: /usr/local/include/SDL11/SDL_main.h
+main.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+main.o: /usr/include/machine/_types.h /usr/include/stdio.h
+main.o: /usr/include/string.h /usr/include/strings.h
+main.o: /usr/local/include/SDL11/SDL.h /usr/local/include/SDL11/SDL_main.h
 main.o: /usr/local/include/SDL11/SDL_types.h
 main.o: /usr/local/include/SDL11/SDL_getenv.h
 main.o: /usr/local/include/SDL11/SDL_error.h
@@ -100,12 +101,13 @@ main.o: /usr/local/include/SDL11/SDL_mouse.h
 main.o: /usr/local/include/SDL11/SDL_video.h
 main.o: /usr/local/include/SDL11/SDL_mutex.h
 main.o: /usr/local/include/SDL11/SDL_quit.h
-main.o: /usr/local/include/SDL11/SDL_version.h z80/z80.h spec.h gfx.h gui.h
+main.o: /usr/local/include/SDL11/SDL_version.h z80.h spec.h gfx.h gui.h
 main.o: memmenu.h config.h kbbmp.h exit.h util.h
 spec.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-spec.o: /usr/include/machine/ansi.h /usr/include/stdio.h
-spec.o: /usr/include/string.h spec.h z80/z80.h /usr/local/include/SDL11/SDL.h
-spec.o: /usr/local/include/SDL11/SDL_main.h
+spec.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+spec.o: /usr/include/machine/_types.h /usr/include/stdio.h
+spec.o: /usr/include/string.h /usr/include/strings.h spec.h z80.h
+spec.o: /usr/local/include/SDL11/SDL.h /usr/local/include/SDL11/SDL_main.h
 spec.o: /usr/local/include/SDL11/SDL_types.h
 spec.o: /usr/local/include/SDL11/SDL_getenv.h
 spec.o: /usr/local/include/SDL11/SDL_error.h
@@ -128,13 +130,17 @@ spec.o: /usr/local/include/SDL11/SDL_quit.h
 spec.o: /usr/local/include/SDL11/SDL_version.h snap.h gfx.h gui.h config.h
 spec.o: exit.h util.h
 snap.o: snap.h /usr/include/stdlib.h /usr/include/sys/cdefs.h
-snap.o: /usr/include/machine/ansi.h /usr/include/stdio.h z80/z80.h util.h
+snap.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+snap.o: /usr/include/machine/_types.h /usr/include/stdio.h z80.h util.h
 config.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-config.o: /usr/include/machine/ansi.h /usr/include/stdio.h
-config.o: /usr/include/string.h exit.h config.h
+config.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+config.o: /usr/include/machine/_types.h /usr/include/stdio.h
+config.o: /usr/include/string.h /usr/include/strings.h exit.h config.h
 gfx.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-gfx.o: /usr/include/machine/ansi.h /usr/include/stdio.h /usr/include/string.h
-gfx.o: /usr/include/stdarg.h gfx.h /usr/local/include/SDL11/SDL.h
+gfx.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+gfx.o: /usr/include/machine/_types.h /usr/include/stdio.h
+gfx.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdarg.h
+gfx.o: gfx.h /usr/local/include/SDL11/SDL.h
 gfx.o: /usr/local/include/SDL11/SDL_main.h
 gfx.o: /usr/local/include/SDL11/SDL_types.h
 gfx.o: /usr/local/include/SDL11/SDL_getenv.h
@@ -157,10 +163,22 @@ gfx.o: /usr/local/include/SDL11/SDL_mutex.h
 gfx.o: /usr/local/include/SDL11/SDL_quit.h
 gfx.o: /usr/local/include/SDL11/SDL_version.h exit.h config.h font.h
 gui.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-gui.o: /usr/include/machine/ansi.h /usr/include/stdio.h /usr/include/string.h
-gui.o: /usr/include/stdarg.h /usr/include/ctype.h /usr/include/runetype.h
-gui.o: gui.h gfx.h /usr/local/include/SDL11/SDL.h
-gui.o: /usr/local/include/SDL11/SDL_main.h
+gui.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+gui.o: /usr/include/machine/_types.h /usr/include/stdio.h
+gui.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdarg.h
+gui.o: /usr/include/ctype.h /usr/include/_ctype.h /usr/include/runetype.h
+gui.o: /usr/include/unistd.h /usr/include/sys/types.h
+gui.o: /usr/include/machine/endian.h /usr/include/sys/_pthreadtypes.h
+gui.o: /usr/include/sys/select.h /usr/include/sys/_sigset.h
+gui.o: /usr/include/sys/_timeval.h /usr/include/sys/timespec.h
+gui.o: /usr/include/sys/unistd.h /usr/include/dirent.h
+gui.o: /usr/include/sys/dirent.h /usr/include/sys/stat.h
+gui.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/param.h
+gui.o: /usr/include/sys/syslimits.h /usr/include/sys/signal.h
+gui.o: /usr/include/machine/signal.h /usr/include/machine/trap.h
+gui.o: /usr/include/machine/param.h /usr/include/sys/limits.h
+gui.o: /usr/include/machine/_limits.h gui.h gfx.h
+gui.o: /usr/local/include/SDL11/SDL.h /usr/local/include/SDL11/SDL_main.h
 gui.o: /usr/local/include/SDL11/SDL_types.h
 gui.o: /usr/local/include/SDL11/SDL_getenv.h
 gui.o: /usr/local/include/SDL11/SDL_error.h
@@ -182,9 +200,11 @@ gui.o: /usr/local/include/SDL11/SDL_mutex.h
 gui.o: /usr/local/include/SDL11/SDL_quit.h
 gui.o: /usr/local/include/SDL11/SDL_version.h exit.h util.h
 memmenu.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-memmenu.o: /usr/include/machine/ansi.h /usr/include/stdio.h
-memmenu.o: /usr/include/string.h /usr/include/ctype.h /usr/include/runetype.h
-memmenu.o: memmenu.h z80/z80.h spec.h /usr/local/include/SDL11/SDL.h
+memmenu.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+memmenu.o: /usr/include/machine/_types.h /usr/include/stdio.h
+memmenu.o: /usr/include/string.h /usr/include/strings.h /usr/include/ctype.h
+memmenu.o: /usr/include/_ctype.h /usr/include/runetype.h memmenu.h z80.h
+memmenu.o: spec.h /usr/local/include/SDL11/SDL.h
 memmenu.o: /usr/local/include/SDL11/SDL_main.h
 memmenu.o: /usr/local/include/SDL11/SDL_types.h
 memmenu.o: /usr/local/include/SDL11/SDL_getenv.h
@@ -207,11 +227,21 @@ memmenu.o: /usr/local/include/SDL11/SDL_mutex.h
 memmenu.o: /usr/local/include/SDL11/SDL_quit.h
 memmenu.o: /usr/local/include/SDL11/SDL_version.h gfx.h gui.h util.h
 util.o: /usr/include/stdio.h /usr/include/sys/cdefs.h
-util.o: /usr/include/machine/ansi.h /usr/include/string.h
-util.o: /usr/include/stdarg.h util.h /usr/include/stdlib.h exit.h
+util.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+util.o: /usr/include/machine/_types.h /usr/include/string.h
+util.o: /usr/include/strings.h /usr/include/stdarg.h /usr/include/sys/param.h
+util.o: /usr/include/sys/types.h /usr/include/machine/endian.h
+util.o: /usr/include/sys/_pthreadtypes.h /usr/include/sys/select.h
+util.o: /usr/include/sys/_sigset.h /usr/include/sys/_timeval.h
+util.o: /usr/include/sys/timespec.h /usr/include/sys/syslimits.h
+util.o: /usr/include/sys/signal.h /usr/include/machine/signal.h
+util.o: /usr/include/machine/trap.h /usr/include/machine/param.h
+util.o: /usr/include/sys/limits.h /usr/include/machine/_limits.h util.h
+util.o: /usr/include/stdlib.h exit.h
 kbbmp.o: kbbmp.h
 exit.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-exit.o: /usr/include/machine/ansi.h /usr/include/stdarg.h exit.h
+exit.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+exit.o: /usr/include/machine/_types.h /usr/include/stdarg.h exit.h
 exit.o: /usr/local/include/SDL11/SDL.h /usr/local/include/SDL11/SDL_main.h
 exit.o: /usr/local/include/SDL11/SDL_types.h
 exit.o: /usr/local/include/SDL11/SDL_getenv.h
@@ -233,3 +263,19 @@ exit.o: /usr/local/include/SDL11/SDL_video.h
 exit.o: /usr/local/include/SDL11/SDL_mutex.h
 exit.o: /usr/local/include/SDL11/SDL_quit.h
 exit.o: /usr/local/include/SDL11/SDL_version.h
+expr.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+expr.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+expr.o: /usr/include/machine/_types.h /usr/include/stdio.h
+expr.o: /usr/include/string.h /usr/include/strings.h /usr/include/ctype.h
+expr.o: /usr/include/_ctype.h /usr/include/runetype.h
+z80.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+z80.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+z80.o: /usr/include/machine/_types.h /usr/include/string.h
+z80.o: /usr/include/strings.h z80.h z80_private.h
+z80_decode.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+z80_decode.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+z80_decode.o: /usr/include/machine/_types.h z80.h z80_private.h
+z80_dis.o: /usr/include/stdio.h /usr/include/sys/cdefs.h
+z80_dis.o: /usr/include/sys/_null.h /usr/include/sys/_types.h
+z80_dis.o: /usr/include/machine/_types.h /usr/include/string.h
+z80_dis.o: /usr/include/strings.h /usr/include/stdarg.h z80.h z80_private.h