X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=4782eb61cbcb13d08b3ae4d3e7d0cfb54ed020db;hb=19eb631a30a429d92dc934594ea0140f5f75ebc4;hp=75ec9f964d05fba78fb287cf313ec57408b8bcde;hpb=1da02afcc20a192e9cad7f97c6579884d43a7cf0;p=16.git

diff --git a/makefile b/makefile
index 75ec9f96..4782eb61 100755
--- a/makefile
+++ b/makefile
@@ -53,6 +53,7 @@ DUMP=*type
 
 TARGET_OS = dos
 
+BUILD_ROOT=$+$(%__CWD__)$-
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 PDIR=..$(DIRSEP)
 SRC=src$(DIRSEP)
@@ -205,88 +206,40 @@ vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB)
 {$(SRC)}.C.$(OBJ):
 	*wcl $(FLAGS) -c $[@
 
-16.$(OBJ): $(SRC)16.h $(SRC)16.c
-####	*wcl $(FLAGS) -c $(SRC)16.c
-
-bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c
-####	*wcl $(FLAGS) -c $(SRC)bakapi.c
-
-test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
-####	*wcl $(FLAGS) -c $(SRC)test.c
-
-#test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
-#####	*wcl $(FLAGS) -c $(SRC)test2.c
-
-test0.$(OBJ): $(SRC)test0.c
-####	*wcl $(FLAGS) -c $(SRC)test0.c
-
-pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
-####	*wcl $(FLAGS) -c $(SRC)pcxtest.c
-
-vrstest.$(OBJ): $(SRC)vrstest.c $(SRCLIB)modex16.h
-####	*wcl $(FLAGS) -c $(SRC)vrstest.c
-
-##planrpcx.$(OBJ): $(SRC)planrpcx.c $(SRCLIB)modex16.h
-######	*wcl $(FLAGS) -c $(SRC)planrpcx.c
-
-pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h
-####	*wcl $(FLAGS) -c $(SRC)pcxtest2.c
-
-palettec.$(OBJ): $(SRC)palettec.c
-####	*wcl $(FLAGS) -c $(SRC)palettec.c
-
-palettel.$(OBJ): $(SRC)palettel.c
-####	*wcl $(FLAGS) -c $(SRC)palettel.c
-
-maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h
-####	*wcl $(FLAGS) -c $(SRC)maptest.c
-
-#emmtest.$(OBJ): $(SRC)emmtest.c
-#####	*wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
-
-#emsdump.$(OBJ): $(SRC)emsdump.c
-#####	*wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
-
-fmemtest.$(OBJ): $(SRC)fmemtest.c
-####	*wcl $(FLAGS) -c $(SRC)fmemtest.c
-
-fonttest.$(OBJ): $(SRC)fonttest.c
-####	*wcl $(FLAGS) -c $(SRC)fonttest.c
-
-#fonttes0.$(OBJ): $(SRC)fonttes0.c
-#####	*wcl $(FLAGS) -c $(SRC)fonttes0.c
-
-fontgfx.$(OBJ): $(SRC)fontgfx.c
-####	*wcl $(FLAGS) -c $(SRC)fontgfx.c
-
-inputest.$(OBJ): $(SRC)inputest.c
-####	*wcl $(FLAGS) -c $(SRC)inputest.c
-
-#sountest.$(OBJ): $(SRC)sountest.c
-#	*wcl $(FLAGS) -c $(SRC)sountest.c
-
-#miditest.$(OBJ): $(SRC)miditest.c
-#	*wcl $(FLAGS) -c $(SRC)miditest.c
-
-#testemm.$(OBJ): $(SRC)testemm.c
-#	*wcl $(FLAGS) -c $(SRC)testemm.c
-
-#testemm0.$(OBJ): $(SRC)testemm0.c
-#	*wcl $(FLAGS) -c $(SRC)testemm0.c
-
-tsthimem.$(OBJ): $(SRC)tsthimem.c
-####	*wcl $(FLAGS) -c $(SRC)tsthimem.c
-
-exmmtest.$(OBJ): $(SRC)exmmtest.c
+16.$(OBJ): $(SRC)16.h $(SRC)16.c .symbolic
+bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c .symbolic
+test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h .symbolic
+#test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h .symbolic
+test0.$(OBJ): $(SRC)test0.c .symbolic
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h .symbolic
+vrstest.$(OBJ): $(SRC)vrstest.c $(SRCLIB)modex16.h .symbolic
+##planrpcx.$(OBJ): $(SRC)planrpcx.c $(SRCLIB)modex16.h .symbolic
+pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h .symbolic
+palettec.$(OBJ): $(SRC)palettec.c .symbolic
+palettel.$(OBJ): $(SRC)palettel.c .symbolic
+maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h .symbolic
+#emmtest.$(OBJ): $(SRC)emmtest.c .symbolic
+#emsdump.$(OBJ): $(SRC)emsdump.c .symbolic
+fmemtest.$(OBJ): $(SRC)fmemtest.c .symbolic
+fonttest.$(OBJ): $(SRC)fonttest.c .symbolic
+#fonttes0.$(OBJ): $(SRC)fonttes0.c .symbolic
+fontgfx.$(OBJ): $(SRC)fontgfx.c .symbolic
+inputest.$(OBJ): $(SRC)inputest.c .symbolic
+#sountest.$(OBJ): $(SRC)sountest.c .symbolic
+#miditest.$(OBJ): $(SRC)miditest.c .symbolic
+#testemm.$(OBJ): $(SRC)testemm.c .symbolic
+#testemm0.$(OBJ): $(SRC)testemm0.c .symbolic
+#tsthimem.$(OBJ): $(SRC)tsthimem.c .symbolic
+exmmtest.$(OBJ): $(SRC)exmmtest.c .symbolic
 ####	*wcl $(FLAGS) -c $(SRC)exmmtest.c 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
-
-vgmtest.$(OBJ): $(SRC)vgmtest.c
-####	*wcl $(FLAGS) -c $(SRC)vgmtest.c
-	#====*wcl -mc -c $(SRC)vgmtest.c
+vgmtest.$(OBJ): $(SRC)vgmtest.c .symbolic
 
 #
 #non executable objects libraries
 #
+#.C.LIB:
+#	*wlib -b $(WLIBQ) $[@
+
 16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib
 	*wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
 
@@ -302,95 +255,109 @@ vgmsnd.lib: $(VGMSNDOBJ)
 # library deps 16-bit huge
 $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib:
 	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu && .$(DIRSEP)make.sh
+	cd $(BUILD_ROOT)
 $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib:
 	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos && .$(DIRSEP)make.sh
+	cd $(BUILD_ROOT)
 $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vgatty.lib:
 	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
+	cd $(BUILD_ROOT)
 $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib:
 	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
+	cd $(BUILD_ROOT)
 $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250$(DIRSEP)dos86h$(DIRSEP)8250.lib:
 	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250 && .$(DIRSEP)make.sh
+	cd $(BUILD_ROOT)
 
 joytest.exe:
-	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)joytest.exe
+	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(BUILD_ROOT)$(DIRSEP)joytest.exe
+	cd $(BUILD_ROOT)
 #$(DOSLIBLIBS): .symbolic
 #	@cd $(DOSLIB)
 #	@.$(DIRSEP)buildall.sh
-#	@cd $(PDIR)$(PDIR)$(PDIR)
+#	@cd $(BUILD_ROOT)
+
+{$(SRCLIB)}.C.$(OBJ):
+	*wcl $(FLAGS) -c $[@
 
-modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
-	*wcl $(FLAGS) -c $(SRCLIB)modex16.c
+modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
-bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c
-	*wcl $(FLAGS) -c $(SRCLIB)bakapee.c
+bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)bakapee.c
 
-16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c
-	*wcl $(FLAGS) -c $(MODEXLIB)16render.c
+16render.$(OBJ): $(SRCLIB)16render.h $(SRCLIB)16render.c .symbolic
+	#*wcl $(FLAGS) -c $(MODEXLIB)16render.c
 
 ##16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c
 ##	*wcl $(FLAGS) -c $(MODEXLIB)16planar.c
 
-16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
-	*wcl $(FLAGS) -c $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
-16_sprit.$(OBJ): $(SRCLIB)16_sprit.h $(SRCLIB)16_sprit.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_sprit.c
+16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c $(DOSLIBLIBS) .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
+16_sprit.$(OBJ): $(SRCLIB)16_sprit.h $(SRCLIB)16_sprit.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_sprit.c
 
 
-bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
-	*wcl $(FLAGS) -c $(SRCLIB)bitmap.c
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)bitmap.c
 
 ##planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
 ##	*wcl $(FLAGS) -c $(SRCLIB)planar.c
 
-scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
-	*wcl $(FLAGS) -c $(SRCLIB)scroll16.c
-
-wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
-	*wcl $(FLAGS) -c $(WCPULIB)wcpu.c
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 
-16text.$(OBJ): $(SRCLIB)16text.c
-	*wcl $(FLAGS) -c $(SRCLIB)16text.c
+16text.$(OBJ): $(SRCLIB)16text.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16text.c
 
-mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
-	*wcl $(FLAGS) -c $(SRCLIB)mapread.c
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
-16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_timer.c
+16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_timer.c
 
-16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_in.c
+16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_in.c
 
-16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_mm.c
+16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_mm.c
 
-16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_ca.c
 
-16_dbg.$(OBJ): $(SRCLIB)16_dbg.h $(SRCLIB)16_dbg.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_dbg.c
+16_dbg.$(OBJ): $(SRCLIB)16_dbg.h $(SRCLIB)16_dbg.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_dbg.c
 
-midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c
-	*wcl $(FLAGS) -c $(SRCLIB)midi.c
+midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)midi.c
 
-16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_head.c
+16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_head.c
 
-16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_hc.c
+16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_hc.c
 
-16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c
-	*wcl $(FLAGS) -c $(SRCLIB)16_snd.c
-	#====*wcl -mc -c $(SRCLIB)16_snd.c
+16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c .symbolic
+	#*wcl $(FLAGS) -c $(SRCLIB)16_snd.c
 
-jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
-	*wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
-kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
-	*wcl $(FLAGS) -c $(NYANLIB)kitten.c
+{$(JSMNLIB)}.C.$(OBJ):
+	*wcl $(FLAGS) -c $[@
+{$(NYANLIB)}.C.$(OBJ):
+	*wcl $(FLAGS) -c $[@
+{$(VGMSNDLIB)}.C.$(OBJ):
+	*wcl $(FLAGS) -c $[@
+{$(WCPULIB)}.C.$(OBJ):
+	*wcl $(FLAGS) -c $[@
 
-vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
-	*wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
-	#====*wcl -c -mc $(VGMSNDLIB)vgmSnd.c
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c .symbolic
+	#*wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
+kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c .symbolic
+	#*wcl $(FLAGS) -c $(NYANLIB)kitten.c
+vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c .symbolic
+	#*wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c .symbolic
+	#*wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 
 #memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
 #	*wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
@@ -432,7 +399,7 @@ clean: .symbolic
 	@echo $(OBJ)
 	#@cd $(DOSLIB)
 	#@./buildall.sh clean
-	#@cd $(PDIR)$(PDIR)$(PDIR)
+	#@cd $(BUILD_ROOT)
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -477,15 +444,15 @@ vomitchan: .symbolic
 mkdl: .symbolic
 	@cd $(DOSLIB)
 	@./buildall.sh
-	@cd $(PDIR)$(PDIR)$(PDIR)
+	@cd $(BUILD_ROOT)
 
 uplibs: .symbolic
 	@cd $(JSMNLIB)
 	@git pull
-	@cd $(PDIR)$(PDIR)$(PDIR)
+	@cd $(BUILD_ROOT)
 	@cd $(DOSLIB)
 	@git pull
-	@cd $(PDIR)$(PDIR)$(PDIR)
+	@cd $(BUILD_ROOT)
 
 reinitlibs: .symbolic
 	@rm -rf $(SRCLIB)doslib
@@ -502,12 +469,12 @@ initlibs: .symbolic
 	@cd $(SRCLIB)
 	@git clone https://github.com/joncampbell123/doslib.git
 	@git clone https://github.com/zserge/jsmn.git
-	@cd $(PDIR)$(PDIR)
+	@cd $(BUILD_ROOT)
 	@cd 16
 	@git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
 	@git clone https://github.com/id-Software/wolf3d.git
 	@git clone https://github.com/keendreams/keen.git
-	@cd $(PDIR)
+	@cd $(BUILD_ROOT)
 	@cp $(SRCLIB)doslib/make-lowercase .
 
 ##
@@ -517,25 +484,25 @@ xlib: .symbolic
 	@cd 16$(DIRSEP)xlib
 	@wmake -h clean
 	@wmake -h all
-	@cd $(PDIR)$(PDIR)
+	@cd $(BUILD_ROOT)
 
 mx: .symbolic
 	@cd 16$(DIRSEP)xw
 #	@wmake clean
 	@wmake -h all
-	@cd $(PDIR)$(PDIR)
+	@cd $(BUILD_ROOT)
 
 mx_: .symbolic
 	@cd 16$(DIRSEP)xw_
 	@wmake -h -f makefile all
-	@cd $(PDIR)$(PDIR)
+	@cd $(BUILD_ROOT)
 
 vrs: .symbolic
 	@cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga
 	#@make clean
 	@make all
-	@mv pcx2vrl ../../../../../
-	@mv pcxsscut ../../../../../
-	@mv vrl2vrs ../../../../../
-	@mv vrsdump ../../../../../
-	@cd ../../../../../
+	@mv pcx2vrl $(BUILD_ROOT)$(DIRSEP)
+	@mv pcxsscut $(BUILD_ROOT)$(DIRSEP)
+	@mv vrl2vrs $(BUILD_ROOT)$(DIRSEP)
+	@mv vrsdump $(BUILD_ROOT)$(DIRSEP)
+	@cd $(BUILD_ROOT)