X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=213d0e69b8f2d28edee821fce21bc1aab18af985;hb=f480274a370e0a2fb665bd6ba71b1d760dcd8d43;hp=17b76a6de008db524da95597217cb95633c7b6d2;hpb=41372bb7e550deed8465228a76a864106106a4ff;p=16.git

diff --git a/makefile b/makefile
index 17b76a6d..213d0e69 100755
--- a/makefile
+++ b/makefile
@@ -20,6 +20,7 @@ SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 NYANLIB=$(SRCLIB)nyan$(DIRSEP)
 #EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
 DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
@@ -34,11 +35,12 @@ FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(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)
+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)
 
-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 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)
@@ -59,52 +61,52 @@ scroll.exe: 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) sega.$(OBJ)
-sega.$(OBJ): $(SRC)sega.c
-	wcl $(FLAGS) -c $(SRC)sega.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.map
 
 test2.exe: test2.$(OBJ) gfx.lib
-	wcl $(FLAGS) test2.$(OBJ) gfx.lib
+	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map
 
 fonttest.exe: fonttest.$(OBJ) 16.lib
-	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
+	wcl $(FLAGS) fonttest.$(OBJ) 16.lib# -fm=fonttest.map
 
-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.map
 
 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.map
 
-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 $(DOSLIBEXMMOBJ) midi.$(OBJ)
-	wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
+#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)
+	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) -fm=tsthimem.map
 
-testemm.exe: testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
-	wcl $(FLAGS) testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#testemm.exe: testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#	wcl $(FLAGS) testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
 
-testemm0.exe: testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
-	wcl $(FLAGS) testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#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.map
 
 palettec.exe: palettec.$(OBJ) 16.lib
-	wcl $(FLAGS) palettec.$(OBJ) 16.lib
+	wcl $(FLAGS) palettec.$(OBJ) 16.lib -fm=palettec.map
 
 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.map
 
 #maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
 #	wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
@@ -116,11 +118,14 @@ 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.map
 
 exmmtest.exe: exmmtest.$(OBJ) 16.lib
 	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map
 
+vgmtest.exe: vgmtest.$(OBJ) 16.lib
+	wcl $(FLAGS) vgmtest.$(OBJ) 16.lib -fm=vgmtest.map
+
 #
 #executable's objects
 #
@@ -160,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
@@ -169,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
@@ -187,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
 #
@@ -227,7 +235,7 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
 #	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
 
 timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
-        wcl $(FLAGS) -c $(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
@@ -277,7 +285,10 @@ 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
+	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
@@ -296,7 +307,10 @@ clean: .symbolic
 	@wlib -n  gfx.lib
 	@wlib -n  doslib.lib
 	@$(REMOVECOMMAND) *.16
+	@$(REMOVECOMMAND) *.16W
+	@$(REMOVECOMMAND) *.16B
 	@$(REMOVECOMMAND) *.OBJ
+	@$(REMOVECOMMAND) *.o
 	@$(REMOVECOMMAND) *.BCO
 	@$(REMOVECOMMAND) makefi~1
 	@$(REMOVECOMMAND) makefile~
@@ -304,6 +318,8 @@ clean: .symbolic
 #	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
 	@$(REMOVECOMMAND) *.hed
+	@$(REMOVECOMMAND) *.MAP
+	@$(REMOVECOMMAND) *.map
 	@$(COPYCOMMAND) .git/config git_con.fig
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)