scroll.exe somewhat works again! wwww

[16.git] / makefile

diff --git a/makefile b/makefile
index 5bfc58ea0ac49a9473ae5bf892daecf1d599dacd..136770b87f9d484dd1831c352692012c3c98ef18 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 !ifdef __LINUX__
-REMOVECOMMAND=rm
+REMOVECOMMAND=rm -f
 DIRSEP=/
 OBJ=o
 !else
@@ -21,7 +21,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 ZFLAGS=-zk0 -zu -zc# -zm# -zdp# -zp16 -zq
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
-CFLAGS=-ei -wo -x -mc -r -fh=16.hed -k60000#16384#
+CFLAGS=-ei -wo -x -mc -r -k60000 -fh=16.hed#16384#
 OFLAGS=-ot -ox -ob -oh -or -om -ol# -ol+
 FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS)
 
@@ -30,7 +30,7 @@ DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OB
 16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe sountest.exe tsthimem.exe inputest.exe
+TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe sountest.exe tsthimem.exe inputest.exe scroll.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC)
 
@@ -47,10 +47,11 @@ bakapi.exe: bakapi.$(OBJ) 16.lib
 #
 #Test Executables!
 #
-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.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
+       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
 scroll.$(OBJ): $(SRC)scroll.c
        wcl $(FLAGS) -c $(SRC)scroll.c
+
 sega.exe: sega.$(OBJ)
        wcl $(FLAGS) -c sega.$(OBJ)
 sega.$(OBJ): $(SRC)sega.c
@@ -212,8 +213,8 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 16text.$(OBJ): $(SRCLIB)16text.c
        wcl $(FLAGS) -c $(SRCLIB)16text.c
 
-mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
+       wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
 #fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
 #      wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
@@ -279,9 +280,11 @@ clean: .symbolic
        @wlib -n  gfx.lib
        @wlib -n  doslib.lib
        @$(REMOVECOMMAND) *.16
-#      @$(REMOVECOMMAND) *.OBJ
-#      @$(REMOVECOMMAND) makefi~1
-#      @$(REMOVECOMMAND) makefile~
-#      @$(REMOVECOMMAND) __WCL__.LNK
+       @$(REMOVECOMMAND) *.OBJ
+       @$(REMOVECOMMAND) makefi~1
+       @$(REMOVECOMMAND) makefile~
+       @$(REMOVECOMMAND) __WCL__.LNK
 #      @$(REMOVECOMMAND) *.smp
-#      @$(REMOVECOMMAND) *.SMP
+       @$(REMOVECOMMAND) *.SMP
+       @$(REMOVECOMMAND) 16.hed
+