16_sd official port started. but class and work in the way

[16.git] / makefile

diff --git a/makefile b/makefile
index 8a8bd909d822c1d11035b5309a729a85e67f156c..b0302b88cc83b273b5e30ce55f21b3fdd2f50869 100755 (executable)
--- 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
 
@@ -259,7 +261,7 @@ ALLEXEC = &
        $(TESTEXEC2) &
        $(TESTEXEC3)
 
-all: $(EXEC)
+all: $(EXEC)#  id_sd.$(OBJ)
 testexec: $(EXEC) $(TESTEXEC2)
 
 #
@@ -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
@@ -424,6 +424,7 @@ mapread.$(OBJ):     $(SRCLIB)/mapread.c     $(SRCLIB)/mapread.h
 16_tail_.$(OBJ):       $(SRCLIB)/16_tail_.c    $(SRCLIB)/16_tail.h
 16_hc.$(OBJ):  $(SRCLIB)/16_hc.c       $(SRCLIB)/16_hc.h
 16_sd.$(OBJ):  $(SRCLIB)/16_sd.c       $(SRCLIB)/16_sd.h
+id_sd.$(OBJ):  $(SRCLIB)/id_sd.c       $(SRCLIB)/id_sd.h
 jsmn.$(OBJ):   $(JSMNLIB)/jsmn.c       $(JSMNLIB)/jsmn.h
 kitten.$(OBJ): $(NYANLIB)/kitten.c     $(NYANLIB)/kitten.h
 vgmSnd.$(OBJ): $(VGMSNDLIB)/vgmSnd.c   $(VGMSNDLIB)/vgmSnd.h
@@ -464,7 +465,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 +475,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 +504,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
@@ -554,10 +556,16 @@ www: .symbolic
        @if exist 16.exe @wmake -s -h wwwdo
        @if exist 16.exe @wmake -s -h wwwext
 
-wwwdo: .symbolic
+cleanwww:      .symbolic
+wwwclean:      .symbolic
+wwwcl:         .symbolic
+clwww:         .symbolic
        @for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
        @$(REMOVECOMMAND) /var/www/*.exe.zi*
        @$(REMOVECOMMAND) /var/www/*.zip.zi*
+
+wwwdo: .symbolic
+       @wmake clwww
        @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
        @./src/util/z.sh $(EXEC) $(EXEC)
        @./src/util/z2.sh data.zip data
@@ -621,6 +629,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 +641,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 +685,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):