added some files

[16.git] / makefile

diff --git a/makefile b/makefile
index bbc64e1b20018ddf66fdcb8592e0bbd5f1fda614..b7c3b5c5511f37a72501ded503961bb1e24b4737 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
@@ -306,7 +306,7 @@ 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)
@@ -495,14 +495,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 +579,25 @@ initscript: .symbolic
 
 
 comp: .symbolic
+       @wmake -s -h exe2e
        @*upx -9 *.exe#$(EXEC)
        @wmake -s -h e2exe
 
 comq: .symbolic
+       @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
@@ -740,7 +747,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