X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=makefile;h=d4cfb155020db685aee64aef24f70144c8cb48f6;hp=8a8bd909d822c1d11035b5309a729a85e67f156c;hb=d40ef7f62ff3e5bd49ffec3b06c881cfa8d02bdb;hpb=6c3169e333e44df5cac3e613c8100d8572fe395f

diff --git a/makefile b/makefile
index 8a8bd909..d4cfb155 100755
--- a/makefile
+++ b/makefile
@@ -211,7 +211,6 @@ TESTEXEC = &
 	0tesuto.exe &
 	maptest.exe &
 	imfplay.exe &
-	i0fplay.exe &
 	vrldbg.exe
 #zcroll.exe &
 TESTEXEC2 = &
@@ -237,7 +236,10 @@ SPRIUTILEXEC = &
 	vrl2vrs &
 	vrsdump &
 	vrldbg &
-	dro2imf
+	dro2imf &
+	dro2vgm &
+	imf2vgm &
+	raw2vgm
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
@@ -292,7 +294,6 @@ fontgfx.exe:	fontgfx.$(OBJ) gfx.lib $(DOSLIB)
 inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 sountest.exe:	sountest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 imfplay.exe:		imfplay.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
-i0fplay.exe:		i0fplay.$(OBJ) $(DOSLIB)
 vrldbg.exe:		vrldbg.$(OBJ) #gfx.lib $(DOSLIB)
 pcxtest.exe:	pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -343,7 +344,6 @@ inputest.$(OBJ):$(SRC)/inputest.c
 #inntest.$(OBJ):$(SRC)/inntest.c
 sountest.$(OBJ): $(SRC)/sountest.c
 imfplay.$(OBJ): $(SRC)/imfplay.c
-i0fplay.$(OBJ): $(SRC)/i0fplay.c
 vrldbg.$(OBJ):	$(SRC)/vrldbg.c
 #miditest.$(OBJ): $(SRC)/miditest.c
 #testemm.$(OBJ):$(SRC)/testemm.c
@@ -464,7 +464,6 @@ dos_kb.$(OBJ):	$(OLDMODEX16LIBDIR)/dos_kb.c	$(OLDMODEX16LIBDIR)/dos_kb.h
 #
 clean: .symbolic
 	@if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
-	@if not exist ps.exe wmake -s -h ps.exe
 	@wmake -s -h initscript
 	@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
@@ -475,6 +474,7 @@ clean: .symbolic
 	#@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 	@if not exist vrl2vrs wmake -s -h pcx2vrl
 	@if not exist dro2imf wmake -s -h drotoimf
+	@if not exist raw2vgm wmake -s -h vgmtools
 !else
 	@if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -503,6 +503,7 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
+#	@if not exist ps.exe wmake -s -h ps.exe
 
 nuke: .symbolic
 	@wmake clean
@@ -621,6 +622,7 @@ reinitlibs: .symbolic
 	@$(REMOVECOMMAND) -rf 16/Catacomb3D
 	@$(REMOVECOMMAND) -rf 16/shitman
 	@$(REMOVECOMMAND) -rf 16/dro2imf
+	@$(REMOVECOMMAND) -rf 16/vgmtools
 	@wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -632,6 +634,7 @@ initlibs: .symbolic
 	@git clone https://github.com/keendreams/keen.git
 	@git clone https://github.com/FlatRockSoft/Catacomb3D.git
 	@git clone https://github.com/Malvineous/dro2imf.git
+	@git clone https://github.com/vgmrips/vgmtools.git
 	@cd $(BUILD_ROOT)
 	@$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 
@@ -675,6 +678,15 @@ drotoimf: .symbolic
 	@make
 	@$(MOVECOMMAND) dro2imf ../..
 	@cd $(BUILD_ROOT)
+
+vgmtools: .symbolic
+	@cd 16/vgmtools
+	@make
+	@$(MOVECOMMAND) dro2vgm ../..
+	@$(MOVECOMMAND) imf2vgm ../..
+	@$(MOVECOMMAND) raw2vgm ../..
+	@cd $(BUILD_ROOT)
+
 vrs: .symbolic
 vrl: .symbolic
 $(SPRIUTILEXEC):