X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=d9a1228dd1a2c9c9e0eb75d6c69462b29b0b4dde;hb=3f80a997a1a0a58abda0d4f4b041d7efb535905c;hp=42f8c197450728efc806399dd1a6ee476b92f6d9;hpb=288f13da2fa6410fe10efbe25a94cccd2b43148b;p=16.git

diff --git a/makefile b/makefile
index 42f8c197..d9a1228d 100755
--- a/makefile
+++ b/makefile
@@ -43,6 +43,7 @@ DIRSEP=/
 OBJ=obj
 DUMP=cat
 DOSLIBMAKE=make.sh
+DOSLIBMAKEALL=buildall.sh
 !else		#DOS ^^
 to_os_path=/=\
 REMOVECOMMAND=*del
@@ -51,6 +52,7 @@ DIRSEP=\
 OBJ=obj
 DUMP=type
 DOSLIBMAKE=make.bat
+DOSLIBMAKEALL=build.bat
 !endif
 
 TARGET_OS = dos
@@ -58,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
@@ -166,7 +168,8 @@ TESTEXEC = &
     inputest.exe &
     palettel.exe &
     exmmtest.exe &
-    vrstest.exe
+    vrstest.exe &
+    vgacamm.exe
 EXEC = &
     16.exe &
     bakapi.exe &
@@ -201,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)
@@ -220,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
@@ -249,9 +254,9 @@ vgmsnd.lib: $(VGMSNDOBJ)
 gfx.lib: $(GFXLIBOBJS)
 	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
 
-# extdep:
-# !include $(DOSLIBDIR)$(DIRSEP)extdep.mak
-
+#
+#	doslib
+#
 # library deps 16-bit huge
 $(DOSLIB_CPU)/dos86h/cpu.lib:
 	cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
@@ -267,10 +272,6 @@ $(DOSLIB_8250)/dos86h/8250.lib:
 joytest.exe:
 	cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
 	$(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)dos86h$(DIRSEP)test.exe joytest.exe
-#$(DOSLIBLIBS): .symbolic
-#	@cd $(DOSLIB:$(to_os_path))
-#	@.$(DIRSEP)buildall.sh
-#	@cd $(BUILD_ROOT)
 
 modex16.$(OBJ):   $(SRCLIB)/modex16.c $(SRCLIB)/modex16.h
 bakapee.$(OBJ):   $(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
@@ -308,8 +309,11 @@ clean: .symbolic
 	@$(REMOVECOMMAND) *.$(OBJ)
 !ifdef __LINUX__
 	@rm *.LIB
+	@. src/util/bcexmm.sh
 	@rm *.EXE
 	#@$(REMOVECOMMAND) *.\$\$\$
+	@$(REMOVECOMMAND) *.OBJ
+	@$(REMOVECOMMAND) *.BCO
 !else
 	@*$(REMOVECOMMAND) *.$$$
 !endif
@@ -319,23 +323,15 @@ clean: .symbolic
 	@*wlib -n $(WLIBQ) 16.lib
 	@*wlib -n $(WLIBQ) gfx.lib
 	@*wlib -n $(WLIBQ) vgmsnd.lib
-	@$(REMOVECOMMAND) *.16W
-	@$(REMOVECOMMAND) *.16B
-	@$(REMOVECOMMAND) *.OBJ
-	@$(REMOVECOMMAND) *.o
-	@$(REMOVECOMMAND) *.BCO
-	#@$(REMOVECOMMAND) makefi~1
-	#@$(REMOVECOMMAND) makefile~
+##	@$(REMOVECOMMAND) *.16W
+##	@$(REMOVECOMMAND) *.16B
 	@$(REMOVECOMMAND) __wcl__.LNK
-#	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
 	@$(REMOVECOMMAND) *.hed
 	@$(REMOVECOMMAND) *.MAH
 	@$(REMOVECOMMAND) *.mah
 	@$(REMOVECOMMAND) *.err
-	#@cd $(DOSLIB:$(to_os_path))
-	#@./buildall.sh clean
-	#@cd $(BUILD_ROOT)
+
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -343,8 +339,12 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
-#	@echo $(watcom)
-#	@echo $(INCLUDE)
+
+nuke: .symbolic
+	@wmake clean
+	@wmake cldl
+	@wmake all
+	@wmake comp
 
 backupconfig: .symbolic
 	@$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
@@ -379,7 +379,12 @@ vomitchan: .symbolic
 #git submodule add <repo>
 mkdl: .symbolic
 	@cd $(DOSLIB:$(to_os_path))
-	@./buildall.sh
+	@$(DOSLIBMAKEALL)
+	@cd $(BUILD_ROOT)
+
+cldl: .symbolic
+	@cd $(DOSLIB:$(to_os_path))
+	@$(DOSLIBMAKEALL) clean
 	@cd $(BUILD_ROOT)
 
 uplibs: .symbolic
@@ -391,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