reference to the bbocg

[16.git] / makefile

diff --git a/makefile b/makefile
index c0f1ecb0c0580b09d65ca730644123125c7d76fd..cfb9aa912f07b7d7de0d58eec119363f61288503 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -55,7 +55,7 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
-MOVECOMMAND=move
+MOVECOMMAND=move /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
@@ -199,6 +199,7 @@ TESTEXEC = &
        vidtest.exe &
        paltest.exe &
        exmmtest.exe &
+       mmtest.exe &
        vgmtest.exe &
        sountest.exe &
        imfplay.exe &
@@ -306,11 +307,12 @@ vrstest.exe:      vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palettec.exe:  palettec.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palettel.exe:          palettel.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palbomb.exe:   palbomb.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-pcxtest2.exe:  pcxtest2.$(OBJ) gfx.lib $(DOSLIB)
+pcxtest2.exe:  pcxtest2.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 #planrpcx.exe: planrpcx.$(OBJ) gfx.lib
 maptest.exe:   maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 fmemtest.exe:  fmemtest.$(OBJ)
 exmmtest.exe:  exmmtest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+mmtest.exe:    mmtest.$(OBJ)   $(16LIB) gfx.lib $(DOSLIB)
        #16_pm.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_mm.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ) 16_vl_1.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_dbg.$(OBJ)
 
 vgmtest.exe:   vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) gfx.lib
@@ -355,6 +357,7 @@ vrldbg.$(OBJ):      $(SRC)/vrldbg.c
 #testemm0.$(OBJ): $(SRC)/testemm0.c
 #tsthimem.$(OBJ): $(SRC)/tsthimem.c
 exmmtest.$(OBJ): $(SRC)/exmmtest.c
+mmtest.$(OBJ): $(SRC)/mmtest.c
 vgmtest.$(OBJ): $(SRC)/vgmtest.c
 db.$(OBJ):             $(UTIL)/db.c
 ps.$(OBJ):             $(SRC)/ps.c
@@ -495,14 +498,15 @@ clean: .symbolic
        @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
        @wmake -s -h initscript
        @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
-       @wmake -s -h exe2e
 !ifdef __LINUX__
        @if exist *.LIB $(REMOVECOMMAND) *.LIB
        @. src/util/bcexmm.sh
        @if exist *.EXE $(REMOVECOMMAND) *.EXE
        @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 vrl2vrs wmake -s -h vrl2vrs
+       @if not exist pcx2vrl wmake -s -h pcx2vrl
+       #@if not exist png2vrl wmake -s -h png2vrl
        @if not exist dro2imf wmake -s -h drotoimf
        @if not exist raw2vgm wmake -s -h vgmtools
 !else
@@ -578,19 +582,25 @@ initscript: .symbolic
 
 
 comp: .symbolic
-       @if exist *.exe @upx -9 *.exe#$(EXEC)
+       @wmake -s -h exe2e
+       @*upx -9 *.exe#$(EXEC)
        @wmake -s -h e2exe
 
 comq: .symbolic
-       @if exist *.exe @upx -9 $(UPXQ) *.exe#$(EXEC)
+       @wmake -s -h exe2e
+       @*upx -9 $(UPXQ) *.exe#$(EXEC)
        @wmake -s -h e2exe
 
 exe2e: .symbolic
-       @if exist *.exe $(MOVECOMMAND) *.exe *.e
-       #@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
+       @for %f in ($(ALLEXEC)) do @if exist %f $(MOVECOMMAND) %f $(SRCLIB)
+!ifdef __LINUX__
+       @if exist *.EXE ./make-lowercase *.EXE
+!endif
+       @if exist *.exe $(MOVECOMMAND) *.exe $(SRC)
+       @if exist $(SRCLIB)/*.exe $(MOVECOMMAND) $(SRCLIB)/*.exe .
 
 e2exe: .symbolic
-       @if exist *.e $(MOVECOMMAND) *.e *.exe
+       @if exist $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
 
 www: .symbolic
        @if exist 16.exe @wmake -s -h wwwdo
@@ -683,6 +693,7 @@ initlibs: .symbolic
        @git clone https://github.com/FlatRockSoft/Catacomb3D.git
        @git clone https://github.com/Malvineous/dro2imf.git
        @git clone https://github.com/vgmrips/vgmtools.git
+       @git clone https://github.com/jeffpar/abrash-black-book
        @cd $(BUILD_ROOT)
        @$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 
@@ -740,7 +751,16 @@ vrl: .symbolic
 $(SPRIUTILEXEC):
        @cd $(DOSLIB_VGA:$(to_os_path))
        #@make clean
-       @make all
+       ####@make all
+       @make pcx2vrl
+       @make vrl2vrs
+       @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#/
+       @cd $(BUILD_ROOT)
+
+png2vrl: .symbolic
+       @cd $(DOSLIB_VGA:$(to_os_path))
+       #@make clean
+       @make png2vrl
        @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#/
        @cd $(BUILD_ROOT)
 !endif