X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=0747b16ceef37d0ed39131a31bfc5dfecfdf66d4;hb=9b4a92c9e0d3a32db2e091abc69b8017abb89b0d;hp=f97dce255774bf9a120a3e31ecafa835e295916e;hpb=d6bf85570f22605fec8f47fc66f19eb5ac9a7c03;p=16.git

diff --git a/makefile b/makefile
index f97dce25..0747b16c 100755
--- a/makefile
+++ b/makefile
@@ -55,12 +55,12 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
-MOVECOMMAND=move
+MOVECOMMAND=move /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
-DOSLIBMAKE=.\make.bat
-DOSLIBMAKEALL=.\build.bat
+DOSLIBMAKE=make.bat build all
+DOSLIBMAKEALL=buildall.bat build all
 !endif
 
 TARGET_OS = dos
@@ -71,9 +71,9 @@ BUILD_ROOT=$+$(%__CWD__)$-
 DATADIR=data/
 SPRI=$(DATADIR)/spri
 SRC=src
-UTIL=$(SRC)/util
+UTIL=$(SRC)$(DIRSEP)util
 GITCONFIGDIR=$(UTIL)/git
-SCRIPTBATDIR=$(UTIL)/shbat
+SCRIPTBATDIR=$(UTIL)$(DIRSEP)shbat
 SRCLIB=$(SRC)/lib
 JSMNLIB=$(SRCLIB)/jsmn
 NYANLIB=$(SRCLIB)/nyan
@@ -199,6 +199,7 @@ TESTEXEC = &
 	vidtest.exe &
 	paltest.exe &
 	exmmtest.exe &
+	mmtest.exe &
 	vgmtest.exe &
 	sountest.exe &
 	imfplay.exe &
@@ -250,11 +251,13 @@ EXEC = &
 	16.exe &
 	bakapi.exe &
 	$(TESTEXEC) &
-	$(UTILEXEC)
+	$(UTILEXEC) &
+	$(DOSLIBTESTEXEC)
 
-#!ifdef __LINUX__
-#EXEC += $(SPRIUTILEXEC)
-#!endif
+!ifdef __LINUX__
+#++?EXEC += $(SPRIUTILEXEC)
+#EXEC += $(DOSLIBTESTEXEC)
+!endif
 
 ALLEXEC = &
 	$(EXEC) &
@@ -304,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
@@ -353,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
@@ -499,7 +504,9 @@ clean: .symbolic
 	@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
@@ -552,31 +559,48 @@ 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__
+	@$(COPYCOMMAND) wbuild.sh wbuild.s
+	@if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+	@$(MOVECOMMAND) wbuild.s wbuild.sh
+
 	@if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
-	@if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
+	@if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh .
 !endif
-	@if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh ./
-	@if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT ./
+	@if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh .
+	@if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT .
 
 initscript: .symbolic
-	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
-	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.bat .
 !ifdef __LINUX__
-	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.sh .
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT .
 !endif
 
 
 comp: .symbolic
-	@*upx -9 $(EXEC)
+	@wmake -s -h exe2e
+	@*upx -9 *.exe#$(EXEC)
+	@wmake -s -h e2exe
 
 comq: .symbolic
-	@*upx -9 $(UPXQ) $(EXEC)
+	@wmake -s -h exe2e
+	@*upx -9 $(UPXQ) *.exe#$(EXEC)
+	@wmake -s -h e2exe
+
+exe2e: .symbolic
+	@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 $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
 
 www: .symbolic
 	@if exist 16.exe @wmake -s -h wwwdo
@@ -657,6 +681,7 @@ reinitlibs: .symbolic
 	@$(REMOVECOMMAND) -rf 16/shitman
 	@$(REMOVECOMMAND) -rf 16/dro2imf
 	@$(REMOVECOMMAND) -rf 16/vgmtools
+	@$(REMOVECOMMAND) -rf 16/abrash-black-book
 	@wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -669,6 +694,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.git
 	@cd $(BUILD_ROOT)
 	@$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 
@@ -726,7 +752,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