testing vgmtest.exe on compy4 soon

[16.git] / makefile

diff --git a/makefile b/makefile
index 7eb271bbdc5cf8e7bcc8f929d1e653453a2fbd3c..ac1cb527b909b0b5090c2bc6dd80195c9dd5e9e3 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -235,7 +235,11 @@ SPRIUTILEXEC = &
        pcxsscut &
        vrl2vrs &
        vrsdump &
-       vrldbg
+       vrldbg &
+       dro2imf &
+       dro2vgm &
+       imf2vgm &
+       raw2vgm
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
@@ -470,6 +474,8 @@ clean: .symbolic
        @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
        #@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
@@ -522,8 +528,8 @@ backupscript: .symbolic
        @$(COPYCOMMAND) wbuild.sh wbuild.s
        @if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
        @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
-       @$(COPYCOMMAND) WBUILD.B WBUILD.BAT
-       @$(COPYCOMMAND) wbuild.s wbuild.sh
+       @$(MOVECOMMAND) WBUILD.B WBUILD.BAT
+       @$(MOVECOMMAND) wbuild.s wbuild.sh
 !ifdef __LINUX__
        @if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
        @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
@@ -615,6 +621,8 @@ reinitlibs: .symbolic
        @$(REMOVECOMMAND) -rf 16/keen
        @$(REMOVECOMMAND) -rf 16/Catacomb3D
        @$(REMOVECOMMAND) -rf 16/shitman
+       @$(REMOVECOMMAND) -rf 16/dro2imf
+       @$(REMOVECOMMAND) -rf 16/vgmtools
        @wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -625,6 +633,8 @@ initlibs: .symbolic
        @git clone https://github.com/id-Software/wolf3d.git
        @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 .
 
@@ -663,6 +673,20 @@ mx_: .symbolic
        @cd $(BUILD_ROOT)
 
 !ifdef __LINUX__
+drotoimf: .symbolic
+       @cd 16/dro2imf
+       @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):