modified: exmmtest.exe

	modified:   inputest.exe
	modified:   makefile
	modified:   src/lib/16_mm.h

diff --git a/exmmtest.exe b/exmmtest.exe
index d2c3d92feb6c5fab83bab266efd4002bdb6a07e2..84bcda1642cb0c1869bdf3d1ac448bc06415d9bc 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/inputest.exe b/inputest.exe
index 5959b1caead423f9656ff038fd4145e4e99cb037..76a53020ae068e104ea7beb7afeb22f1f43ef8da 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index 2d65a108fa48691e71e1e9195c3a095f560e9bf2..081c585624cb590dc321a7f00af70dfa3ea7d882 100644 (file)
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@ REMOVECOMMAND=rm
 DIRSEP=/
 OBJ=o
 !else
-REMOVECOMMAND=del 
+REMOVECOMMAND=del
 DIRSEP=\
 OBJ=obj
 !endif
@@ -22,7 +22,7 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(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 palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
@@ -37,11 +37,11 @@ scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
        wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
 scroll.$(OBJ): $(SRC)scroll.c
        wcl $(FLAGS) -c $(SRC)scroll.c
-test.exe: test.$(OBJ) 16.lib
-       wcl $(FLAGS) test.$(OBJ) 16.lib
+test.exe: test.$(OBJ) gfx.lib
+       wcl $(FLAGS) test.$(OBJ) gfx.lib
 
-test2.exe: test2.$(OBJ) 16.lib
-       wcl $(FLAGS) test2.$(OBJ) 16.lib
+test2.exe: test2.$(OBJ) gfx.lib
+       wcl $(FLAGS) test2.$(OBJ) gfx.lib
 
 fonttest.exe: fonttest.$(OBJ) 16.lib
        wcl $(FLAGS) fonttest.$(OBJ) 16.lib
@@ -49,8 +49,8 @@ fonttest.exe: fonttest.$(OBJ) 16.lib
 inputest.exe: inputest.$(OBJ) 16.lib
        wcl $(FLAGS) inputest.$(OBJ) 16.lib
 
-pcxtest.exe: pcxtest.$(OBJ) 16.lib
-       wcl $(FLAGS) pcxtest.$(OBJ) 16.lib
+pcxtest.exe: pcxtest.$(OBJ) gfx.lib
+       wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib
 
 palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
        wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
@@ -67,11 +67,11 @@ maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 #emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
 #      wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
 
-fmemtest.exe: fmemtest.$(OBJ)
-       wcl $(FLAGS) fmemtest.$(OBJ)
+fmemtest.exe: fmemtest.$(OBJ) 16.lib
+       wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
 
-exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
-        wcl $(FLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)
+exmmtest.exe: exmmtest.$(OBJ) 16.lib
+        wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
 
 #
 #executable's objects

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 701f002de627324a2dae2d84e5c01e594cbb2294..461d1b95cc7c4ef451bcaae2e34fa8a0dfe0bab5 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -200,8 +200,6 @@ void                MML_ShutdownXMS (void);
 void           MML_UseSpace (unsigned segstart, unsigned seglength);
 void           MML_ClearBlock (void);
 
-int US_CheckParm(char *parm,char **strings);
-
 //==========================================================================
 
 #endif