more

[16.git] / makefile

diff --git a/makefile b/makefile
index 354c451c10a1798a9c568fedc90785e5cfe846e0..d4cfb155020db685aee64aef24f70144c8cb48f6 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -235,7 +235,11 @@ SPRIUTILEXEC = &
        pcxsscut &
        vrl2vrs &
        vrsdump &
-       vrldbg
+       vrldbg &
+       dro2imf &
+       dro2vgm &
+       imf2vgm &
+       raw2vgm
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
@@ -460,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__
@@ -470,6 +473,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
@@ -498,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
@@ -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):