moved to model compact~

	modified:   16.exe
	modified:   inputest.exe
	modified:   makefile
	modified:   makefile.gnu
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   src/test.c
	modified:   test.exe
	modified:   test2.exe

diff --git a/16.exe b/16.exe
index bb8b419c7f6f9ca167829d7375cf6527e9a72f27..cdf2d4fca573185cc5fbb6d671da663e7cc98b4e 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/inputest.exe b/inputest.exe
index e48d05c4da524c63c0dabe98ab8e24b63218b220..f483a62d346abba3430751ba12743d5625553515 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index 0562cef2cb158748000713b89e698dda19c6abc1..0af5c1d3fc2154c54cc129204dc9ba578b4241f4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -18,7 +18,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
 
-all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
+all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
 
 #
 #executables
@@ -166,8 +166,8 @@ memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
 #other~
 #
 clean: .symbolic
-#      @$(REMOVECOMMAND) *.$(OBJ)
-       @$(REMOVECOMMAND) *.OBJ
+       @$(REMOVECOMMAND) *.$(OBJ)
+#      @$(REMOVECOMMAND) *.OBJ
 #      @$(REMOVECOMMAND) *.out
 #      @$(REMOVECOMMAND) *.OUT
        @$(REMOVECOMMAND) makefi~1

diff --git a/makefile.gnu b/makefile.gnu
index f86934a9f6a6f2e0bc6d2cfd9968e386e81d9739..3beab28e0e9c0afce223684c6e922061f0c6fe01 100644 (file)
--- a/makefile.gnu
+++ b/makefile.gnu
@@ -3,7 +3,7 @@
 #-zkl = current codepage\r
 \r
 MFLAGS=-mh# -zm\r
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq\r
+CFLAGS=-zkl -wo -x -mc# -zdp# -zp16 -zq\r
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+\r
 FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)\r
 REMOVECOMMAND=rm\r
@@ -18,7 +18,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)\r
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)\r
 \r
-all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe\r
+all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe\r
 \r
 #\r
 #executables\r
@@ -166,8 +166,8 @@ memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
 #other~\r
 #\r
 clean: .symbolic\r
-#       @$(REMOVECOMMAND) *.$(OBJ)\r
-        @$(REMOVECOMMAND) *.OBJ\r
+       @$(REMOVECOMMAND) *.$(OBJ)\r
+#        @$(REMOVECOMMAND) *.OBJ\r
 #       @$(REMOVECOMMAND) *.out\r
 #       @$(REMOVECOMMAND) *.OUT\r
         @$(REMOVECOMMAND) makefi~1\r

diff --git a/maptest.exe b/maptest.exe
index 30bb5541fdfd0fa6e8e67094e2fc81cc04ee1c99..ed045368a4287c97ed7f59fe3d316b18717c5432 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index c577b3537e834c557b3bd38f26ddaf9368bf587e..1df956b83cdee6e76c98fb1f20ed73164eb0ad0b 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 48678f39ff8c1192b85cc7a309cbb8304d477073..c1ec6d87d53155220466f73d10b06ae4e1a9b68a 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/src/test.c b/src/test.c
index 99a2f9f1b64f87f8ac78f8f6a95ad28251c11375..a34ed407862a65798f77177bd8c112e2ad6fe706 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -32,7 +32,7 @@ void main() {
     byte *pal, *pal2=NULL;\r
 \r
     /* load our palette */\r
-    modexLoadPalFile("gfx.pal", &pal2);\r
+    modexLoadPalFile("data/default.pal", &pal2);\r
 \r
     /* save the palette */\r
     pal  = modexNewPal();\r

diff --git a/test.exe b/test.exe
index c6f91f2dedc30ee22a27d95d40f4b688325d4a98..754df6756f8235706a3eeb4cbca84afd6368ecad 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 51b7b74ef1411dcc09c17899c4d05e0d4c6201c6..53173f24550509cf820107f951affde5cd65e707 100644 (file)
Binary files a/test2.exe and b/test2.exe differ