X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=1736eec7a3f1c6460068f735fda26987cd204b58;hb=HEAD;hp=b7c3b5c5511f37a72501ded503961bb1e24b4737;hpb=8a04643047887934be90690e6a1254b403b17fc9;p=16.git

diff --git a/makefile b/makefile
index b7c3b5c5..1736eec7 100755
--- a/makefile
+++ b/makefile
@@ -183,7 +183,7 @@ DOSLIB=doslib.lib
 
 #CFLAGS is neccessary here
 .$(OBJ).exe :
-	*wcl $(LFLAGS) $(extra_$^&_exe_opts)$<		-fe=$@
+	*wcl $(LFLAGS) $(extra_$^&_exe_opts) $<		-fe=$@
 
 LIBMAKERULE=*wlib $(LIBFLAGS) $(extra_$^&_lib_opts)$@ $<
 .$(OBJ).lib :
@@ -199,6 +199,7 @@ TESTEXEC = &
 	vidtest.exe &
 	paltest.exe &
 	exmmtest.exe &
+	mmtest.exe &
 	vgmtest.exe &
 	sountest.exe &
 	imfplay.exe &
@@ -311,6 +312,7 @@ pcxtest2.exe:	pcxtest2.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 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
@@ -505,7 +508,7 @@ clean: .symbolic
 	@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
+	#@if not exist raw2vgm wmake -s -h vgmtools
 !else
 	@if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -678,6 +681,8 @@ reinitlibs: .symbolic
 	@$(REMOVECOMMAND) -rf 16/shitman
 	@$(REMOVECOMMAND) -rf 16/dro2imf
 	@$(REMOVECOMMAND) -rf 16/vgmtools
+	@$(REMOVECOMMAND) -rf 16/abrash-black-book
+	@$(REMOVECOMMAND) -rf 16/keen4-6
 	@wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -690,6 +695,8 @@ 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
+	@git clone https://github.com/sparky4/keen4-6.git
 	@cd $(BUILD_ROOT)
 	@$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .