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

diff --git a/makefile b/makefile
index 4a47b128..0747b16c 100755
--- a/makefile
+++ b/makefile
@@ -199,6 +199,7 @@ TESTEXEC = &
 	vidtest.exe &
 	paltest.exe &
 	exmmtest.exe &
+	mmtest.exe &
 	vgmtest.exe &
 	sountest.exe &
 	imfplay.exe &
@@ -235,7 +236,6 @@ DOSLIBTESTEXEC = &
 	opltest.exe
 SPRIUTILEXEC = &
 	pcx2vrl &
-	png2vrl &
 	pcxsscut &
 	vrl2vrs &
 	vrsdump &
@@ -307,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
@@ -356,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
@@ -502,8 +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 png2vrl wmake -s -h png2vrl
+	@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
@@ -619,7 +622,7 @@ wwwdo: .symbolic
 
 wwwext: .symbolic
 	@wmake -s -h wwwext2
-	#@wmake -s -h wwwext1
+	@wmake -s -h wwwext1
 
 wwwext1: .symbolic
 	####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'
@@ -678,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
@@ -690,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 .
 
@@ -747,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