X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=85dedb5a7620a43d3cf0e255df505d730fc02db8;hb=9f7e47a319a67b514c08ef13237454de0217d94e;hp=03b0183b7f9cef31d6fb159f39a7abffe59d06ee;hpb=a34cbfe09c29f2cebb22016973994758ecffb368;p=16.git

diff --git a/makefile b/makefile
old mode 100644
new mode 100755
index 03b0183b..85dedb5a
--- a/makefile
+++ b/makefile
@@ -1,9 +1,11 @@
 !ifdef __LINUX__
-REMOVECOMMAND=rm
+REMOVECOMMAND=rm -f
+COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=o
 !else
 REMOVECOMMAND=del
+COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 !endif
@@ -12,75 +14,99 @@ TARGET_OS = dos
 #-zk0 = kanji support~
 #-zkl = current codepage
 
-DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm
-CFLAGS=-zk0 -wo -x -mc -zu# -zdp# -zp16 -zq
-OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS)
+#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
-EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+NYANLIB=$(SRCLIB)nyan$(DIRSEP)
+#EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
 DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
+16FLAGS=-fh=16.hed
+BAKAPIFLAGS=-fh=bakapi.hed
+SFLAGS=-sg -st -of+ -k32768 -zu -zdf -zff -zgf#49152#24576
+DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
+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 = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(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) vgmSnd.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe exmmtest.exe fonttes0.exe fontgfx.exe sountest.exe miditest.exe testemm.exe tsthimem.exe inputest.exe testemm0.exe
+TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe tsthimem.exe inputest.exe scroll.exe
+#++++vgmtest.exe
+#testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
+EXEC = 16.exe bakapi.exe $(TESTEXEC)
+
+all: $(EXEC)
 
 #
-#executables
+#game and bakapi executables
 #
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
-	wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=16.maw
 
-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)
+bakapi.exe: bakapi.$(OBJ) 16.lib
+	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) 16.lib -fm=bakapi.maw
+#
+#Test Executables!
+#
+scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
+	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) -fm=scroll.maw
 scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
+
+#sega.exe: sega.$(OBJ)
+#	wcl $(FLAGS) sega.$(OBJ)
+#sega.$(OBJ): $(SRC)sega.c
+#	wcl $(FLAGS) -c $(SRC)sega.c
+
 test.exe: test.$(OBJ) gfx.lib
-	wcl $(FLAGS) test.$(OBJ) gfx.lib
+	wcl $(FLAGS) test.$(OBJ) gfx.lib -fm=test.maw
 
 test2.exe: test2.$(OBJ) gfx.lib
-	wcl $(FLAGS) test2.$(OBJ) gfx.lib
+	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.maw
 
 fonttest.exe: fonttest.$(OBJ) 16.lib
-	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
+	wcl $(FLAGS) fonttest.$(OBJ) 16.lib# -fm=fonttest.maw
 
-fonttes0.exe: fonttes0.$(OBJ) 16.lib
-	wcl $(FLAGS) fonttes0.$(OBJ) 16.lib
+#fonttes0.exe: fonttes0.$(OBJ) 16.lib
+#	wcl $(FLAGS) fonttes0.$(OBJ) 16.lib
 
 fontgfx.exe: fontgfx.$(OBJ) 16.lib
-	wcl $(FLAGS) fontgfx.$(OBJ) 16.lib
+	wcl $(FLAGS) fontgfx.$(OBJ) 16.lib -fm=fontgfx.maw
 
 inputest.exe: inputest.$(OBJ) 16.lib
-	wcl $(FLAGS) -D__DEBUG_InputMgr__=1 inputest.$(OBJ) 16.lib
+	wcl $(FLAGS) -D__DEBUG_InputMgr__=1 inputest.$(OBJ) 16.lib -fm=inputest.maw
 
-sountest.exe: sountest.$(OBJ) 16.lib
-	wcl $(FLAGS) sountest.$(OBJ) 16.lib
+#sountest.exe: sountest.$(OBJ) 16.lib
+#	wcl $(FLAGS) sountest.$(OBJ) 16.lib
 
-miditest.exe: miditest.$(OBJ) 16.lib
-	wcl $(FLAGS) miditest.$(OBJ) 16.lib
+#miditest.exe: miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
+#	wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
 
-tsthimem.exe: tsthimem.$(OBJ) 16.lib
-	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib
+tsthimem.exe: tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) -fm=tsthimem.maw
 
-testemm.exe: testemm.$(OBJ) 16.lib
-	wcl $(FLAGS) testemm.$(OBJ) 16.lib
+#testemm.exe: testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#	wcl $(FLAGS) testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
 
-testemm0.exe: testemm0.$(OBJ) 16.lib
-	wcl $(FLAGS) testemm0.$(OBJ) 16.lib
+#testemm0.exe: testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#	wcl $(FLAGS) testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
 
 pcxtest.exe: pcxtest.$(OBJ) gfx.lib
-	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib
+	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.maw
 
 palettec.exe: palettec.$(OBJ) 16.lib
-	wcl $(FLAGS) palettec.$(OBJ) 16.lib
+	wcl $(FLAGS) palettec.$(OBJ) 16.lib -fm=palettec.maw
 
 maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
-	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=maptest.maw
 
 #maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
 #	wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
@@ -92,10 +118,13 @@ maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 #	wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
 
 fmemtest.exe: fmemtest.$(OBJ) 16.lib
-	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
+	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib -fm=fmemtest.maw
 
 exmmtest.exe: exmmtest.$(OBJ) 16.lib
-	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
+	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.maw
+
+vgmtest.exe: vgmtest.$(OBJ) 16.lib
+	wcl $(FLAGS) vgmtest.$(OBJ) 16.lib -fm=vgmtest.maw
 
 #
 #executable's objects
@@ -103,6 +132,9 @@ exmmtest.exe: exmmtest.$(OBJ) 16.lib
 16.$(OBJ): $(SRC)16.h $(SRC)16.c
 	wcl $(FLAGS) -c $(SRC)16.c
 
+bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c
+	wcl $(FLAGS) -c $(SRC)bakapi.c
+
 test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test.c
 
@@ -133,8 +165,8 @@ fmemtest.$(OBJ): $(SRC)fmemtest.c
 fonttest.$(OBJ): $(SRC)fonttest.c
 	wcl $(FLAGS) -c $(SRC)fonttest.c
 
-fonttes0.$(OBJ): $(SRC)fonttes0.c
-	wcl $(FLAGS) -c $(SRC)fonttes0.c
+#fonttes0.$(OBJ): $(SRC)fonttes0.c
+#	wcl $(FLAGS) -c $(SRC)fonttes0.c
 
 fontgfx.$(OBJ): $(SRC)fontgfx.c
 	wcl $(FLAGS) -c $(SRC)fontgfx.c
@@ -142,17 +174,17 @@ fontgfx.$(OBJ): $(SRC)fontgfx.c
 inputest.$(OBJ): $(SRC)inputest.c
 	wcl $(FLAGS) -c $(SRC)inputest.c
 
-sountest.$(OBJ): $(SRC)sountest.c
-	wcl $(FLAGS) -c $(SRC)sountest.c
+#sountest.$(OBJ): $(SRC)sountest.c
+#	wcl $(FLAGS) -c $(SRC)sountest.c
 
-miditest.$(OBJ): $(SRC)miditest.c
-	wcl $(FLAGS) -c $(SRC)miditest.c
+#miditest.$(OBJ): $(SRC)miditest.c
+#	wcl $(FLAGS) -c $(SRC)miditest.c
 
-testemm.$(OBJ): $(SRC)testemm.c
-	wcl $(FLAGS) -c $(SRC)testemm.c
+#testemm.$(OBJ): $(SRC)testemm.c
+#	wcl $(FLAGS) -c $(SRC)testemm.c
 
-testemm0.$(OBJ): $(SRC)testemm0.c
-	wcl $(FLAGS) -c $(SRC)testemm0.c
+#testemm0.$(OBJ): $(SRC)testemm0.c
+#	wcl $(FLAGS) -c $(SRC)testemm0.c
 
 tsthimem.$(OBJ): $(SRC)tsthimem.c
 	wcl $(FLAGS) -c $(SRC)tsthimem.c
@@ -160,6 +192,9 @@ tsthimem.$(OBJ): $(SRC)tsthimem.c
 exmmtest.$(OBJ): $(SRC)exmmtest.c
 	wcl $(FLAGS) -c $(SRC)exmmtest.c
 
+vgmtest.$(OBJ): $(SRC)vgmtest.c
+	wcl $(FLAGS) -c $(SRC)vgmtest.c
+
 #
 #non executable objects libraries
 #
@@ -169,14 +204,14 @@ exmmtest.$(OBJ): $(SRC)exmmtest.c
 gfx.lib: $(GFXLIBOBJS)
 	wlib -b gfx.lib $(GFXLIBOBJS)
 
-doslib.lib: $(DOSLIBOBJ) $(DOSLIBEXMMOBJ)# $(SRCLIB)cpu.lib
-	wlib -b doslib.lib $(DOSLIBOBJ) $(DOSLIBEXMMOBJ)# $(SRCLIB)cpu.lib
+doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+	wlib -b doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
 
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
-#dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
-#	wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
+bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c
+	wcl $(FLAGS) -c $(SRCLIB)bakapee.c
 
 bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
@@ -193,12 +228,15 @@ 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
 
+timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
+	wcl $(FLAGS) -c $(SRCLIB)timer.c
+
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
 	wcl $(FLAGS) -c $(SRCLIB)16_in.c
 
@@ -235,14 +273,23 @@ himemsys.$(OBJ): $(DOSLIB)himemsys.h $(DOSLIB)himemsys.c
 emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
 	wcl $(FLAGS) -c $(DOSLIB)emm.c
 
-# end
+# end of doslib stuff
 
 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
 
+kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
+	wcl $(FLAGS) -c $(NYANLIB)kitten.c
+
+vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
+	wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
+
 #farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
 #	wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
 
@@ -253,16 +300,30 @@ jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 #other~
 #
 clean: .symbolic
+	@$(REMOVECOMMAND) $(EXEC)
 	@$(REMOVECOMMAND) *.$(OBJ)
 	@$(REMOVECOMMAND) *.lib
 	@wlib -n 16.lib
 	@wlib -n  gfx.lib
-#	@$(REMOVECOMMAND) *.OBJ
-#	@$(REMOVECOMMAND) *.out
-#	@$(REMOVECOMMAND) *.OUT
-#	@$(REMOVECOMMAND) makefi~1
-#	@$(REMOVECOMMAND) makefile~
-#	@$(REMOVECOMMAND) __WCL__.LNK
+	@wlib -n  doslib.lib
+	@$(REMOVECOMMAND) *.16
+	@$(REMOVECOMMAND) *.16W
+	@$(REMOVECOMMAND) *.16B
+	@$(REMOVECOMMAND) *.OBJ
+	@$(REMOVECOMMAND) *.BCO
+	@$(REMOVECOMMAND) makefi~1
+	@$(REMOVECOMMAND) makefile~
+	@$(REMOVECOMMAND) __WCL__.LNK
 #	@$(REMOVECOMMAND) *.smp
-#	@$(REMOVECOMMAND) *.SMP
-
+	@$(REMOVECOMMAND) *.SMP
+	@$(REMOVECOMMAND) *.hed
+	@$(REMOVECOMMAND) *.MAP
+	@$(REMOVECOMMAND) *.maw
+	@$(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)