modified: 16.map

[16.git] / makefile

diff --git a/makefile b/makefile
old mode 100644 (file)
new mode 100755 (executable)
index 9eafa63..bf48054
--- a/makefile
+++ b/makefile
@@ -1,9 +1,11 @@
 !ifdef __LINUX__
 REMOVECOMMAND=rm -f
+COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=o
 !else
 REMOVECOMMAND=del
+COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 !endif
@@ -12,6 +14,7 @@ TARGET_OS = dos
 #-zk0 = kanji support~
 #-zkl = current codepage
 
+#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
@@ -22,21 +25,20 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 16FLAGS=-fh=16.hed
 BAKAPIFLAGS=-fh=bakapi.hed
-#-st -zu
-SFLAGS=-k32768#51200#49152#24576
+SFLAGS=-sg -st -of+ -k32768 -zu -zdf -zff -zgf#49152#24576
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
-ZFLAGS=-zk0 -zq# -zu# -zm# -zc# -zdp# -zp16 -zq
-CFLAGS=-mc -ei -wo -x
-OFLAGS=-otexanbhrml -ol+
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS)
+ZFLAGS=-zk0 -zq -zc -zp8# -zm
+CFLAGS=-mc -lr -l=dos -wo -x# -d2##wwww
+OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
+FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
-DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
-16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ)
+DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
+16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(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 scroll.exe sega.exe
-#testemm.exe testemm0.exe fonttes0.exe miditest.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 sega.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC)
 
 all: $(EXEC)
@@ -45,15 +47,15 @@ all: $(EXEC)
 #game and bakapi executables
 #
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
-       wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+       wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=16.map
 
 bakapi.exe: bakapi.$(OBJ) 16.lib
-       wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) 16.lib
+       wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) 16.lib -fm=bakapi.map
 #
 #Test Executables!
 #
 scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
-       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
+       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) -fm=scroll.map
 scroll.$(OBJ): $(SRC)scroll.c
        wcl $(FLAGS) -c $(SRC)scroll.c
 
@@ -83,8 +85,8 @@ inputest.exe: inputest.$(OBJ) 16.lib
 sountest.exe: sountest.$(OBJ) 16.lib
        wcl $(FLAGS) sountest.$(OBJ) 16.lib
 
-miditest.exe: miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
-       wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+miditest.exe: miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
+       wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
 
 tsthimem.exe: tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
        wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
@@ -117,7 +119,7 @@ fmemtest.exe: fmemtest.$(OBJ) 16.lib
        wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
 
 exmmtest.exe: exmmtest.$(OBJ) 16.lib
-       wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
+       wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map
 
 #
 #executable's objects
@@ -268,6 +270,9 @@ emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
 16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
        wcl $(FLAGS) -c $(SRCLIB)16_head.c
 
+16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
+       wcl $(FLAGS) -c $(SRCLIB)16_hc.c
+
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
        wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
@@ -292,10 +297,18 @@ clean: .symbolic
        @wlib -n  doslib.lib
        @$(REMOVECOMMAND) *.16
        @$(REMOVECOMMAND) *.OBJ
+       @$(REMOVECOMMAND) *.BCO
        @$(REMOVECOMMAND) makefi~1
        @$(REMOVECOMMAND) makefile~
        @$(REMOVECOMMAND) __WCL__.LNK
 #      @$(REMOVECOMMAND) *.smp
        @$(REMOVECOMMAND) *.SMP
-       @$(REMOVECOMMAND) 16.hed
-       @$(REMOVECOMMAND) bakapi.hed
+       @$(REMOVECOMMAND) *.hed
+       @$(COPYCOMMAND) .git/config git_con.fig
+#      @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
+#      @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
+#      @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
+#      @$(COPYCOMMAND) $(SRCLIB)16_ca.* $(EXMMTESTDIR)$(SRCLIB)
+#      @$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
+#      @$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
+#      @$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)