X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=d9a1228dd1a2c9c9e0eb75d6c69462b29b0b4dde;hb=87b809000931a52ad7085f63b96acdc3ec2fc89e;hp=e9c7afe6a2ef49f97411850aae99c5e20f66a861;hpb=fe4bdf43aed47437031018b2aec5cdbfe8b68dd3;p=16.git

diff --git a/makefile b/makefile
index e9c7afe6..d9a1228d 100755
--- a/makefile
+++ b/makefile
@@ -60,7 +60,7 @@ TARGET_OS = dos
 BUILD_ROOT=$+$(%__CWD__)$-
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 DATADIR=data$(DIRSEP)
-SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP)
+SPRI=$(DATADIR)/spri
 SRC=src
 SRCLIB=src/lib
 JSMNLIB=src/lib/jsmn
@@ -168,7 +168,8 @@ TESTEXEC = &
     inputest.exe &
     palettel.exe &
     exmmtest.exe &
-    vrstest.exe
+    vrstest.exe &
+    vgacamm.exe
 EXEC = &
     16.exe &
     bakapi.exe &
@@ -203,6 +204,7 @@ inputest.exe:     inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
 #sountest.exe:    sountest.$(OBJ) $(16LIB)
 pcxtest.exe:      pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS)
 vrstest.exe:      vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+vgacamm.exe:      vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
 palettec.exe:     palettec.$(OBJ) gfx.lib $(DOSLIBLIBS)
 palettel.exe:     palettel.$(OBJ) gfx.lib $(DOSLIBLIBS)
 pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS)
@@ -222,6 +224,7 @@ test.$(OBJ):      $(SRC)/test.c $(SRCLIB)/modex16.h
 test0.$(OBJ):     $(SRC)/test0.c
 pcxtest.$(OBJ):   $(SRC)/pcxtest.c $(SRCLIB)/modex16.h
 vrstest.$(OBJ):   $(SRC)/vrstest.c $(SRCLIB)/modex16.h
+vgacamm.$(OBJ):   $(SRC)/vgacamm.c $(SRCLIB)/modex16.h
 #planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/modex16.h
 pcxtest2.$(OBJ):  $(SRC)/pcxtest2.c $(SRCLIB)/modex16.h
 palettec.$(OBJ):  $(SRC)/palettec.c
@@ -325,8 +328,8 @@ clean: .symbolic
 	@$(REMOVECOMMAND) __wcl__.LNK
 	@$(REMOVECOMMAND) *.SMP
 	@$(REMOVECOMMAND) *.hed
-#	@$(REMOVECOMMAND) *.MAH
-#	@$(REMOVECOMMAND) *.mah
+	@$(REMOVECOMMAND) *.MAH
+	@$(REMOVECOMMAND) *.mah
 	@$(REMOVECOMMAND) *.err
 
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
@@ -393,8 +396,8 @@ uplibs: .symbolic
 	@cd $(BUILD_ROOT)
 
 reinitlibs: .symbolic
-	@rm -rf $(SRCLIB)doslib
-	@rm -rf $(SRCLIB)jsmn
+	@rm -rf $(DOSLIB)
+	@rm -rf $(JSMNLIB)
 	@rm -rf 16/CatacombApocalypse
 	@rm -rf 16/wolf3d
 	@rm -rf 16/keen