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

[16.git] / makefile

diff --git a/makefile b/makefile
index 6b4a2fea51b0a27aa4d547c4bffc7fa1de3ad86f..b0302b88cc83b273b5e30ce55f21b3fdd2f50869 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -115,11 +115,11 @@ WCLQ=-zq
 UPXQ=-qqq
 
 # symbolic debug for wsample/wprof/wd
-D_FLAGS=-d1#+
+D_FLAGS=-d1+
 
 # stacksize
 STKSIZ=32768
-#24576#40960
+#STKSIZ=24576#40960
 
 #
 # compile flags
@@ -227,14 +227,19 @@ UTILEXEC = &
        palettel.exe &
        palllist.exe &
        palbomb.exe &
-       palettec.exe
+       palettec.exe &
+       ps.exe
 !ifdef __LINUX__
 SPRIUTILEXEC = &
        pcx2vrl &
        pcxsscut &
        vrl2vrs &
        vrsdump &
-       vrldbg
+       vrldbg &
+       dro2imf &
+       dro2vgm &
+       imf2vgm &
+       raw2vgm
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
@@ -256,7 +261,7 @@ ALLEXEC = &
        $(TESTEXEC2) &
        $(TESTEXEC3)
 
-all: $(EXEC)
+all: $(EXEC)#  id_sd.$(OBJ)
 testexec: $(EXEC) $(TESTEXEC2)
 
 #
@@ -419,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
@@ -459,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__
@@ -469,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
@@ -497,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
@@ -517,8 +525,12 @@ initconfig: .symbolic
 
 
 backupscript: .symbolic
+       @$(COPYCOMMAND) WBUILD.BAT WBUILD.B
+       @$(COPYCOMMAND) wbuild.sh wbuild.s
        @if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
        @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+       @$(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 ./
@@ -544,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
@@ -610,6 +628,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
@@ -620,6 +640,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 .
 
@@ -658,6 +680,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):