makefile.wat has BUILD_ROOT

[16.git] / makefile.wat

diff --git a/makefile.wat b/makefile.wat
index 2ffe010fa012c9b376cd5a034bc24edd1e303b8e..f1117ccc13cd454f7f417329fc146ac669fd81e7 100755 (executable)
--- a/makefile.wat
+++ b/makefile.wat
@@ -53,6 +53,7 @@ DUMP=*type
 
 TARGET_OS = dos
 
+BUILD_ROOT=$+$(%__CWD__)
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 PDIR=..$(DIRSEP)
 SRC=src$(DIRSEP)
@@ -79,14 +80,20 @@ UPXQ=-qqq
 #
 # compile flags
 #
-AFLAGS=-mh -0 -d1
-SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
-DFLAGS=-bt=dos -DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
-ZFLAGS=-zk0 -zc -zp8 -zm $(WCLQ)
-LFLAGS=-lr -l=dos -v
-CFLAGS=$(AFLAGS) $(IFLAGS) -wo -i$(DOSLIB) $(LFLAGS) -fo=.$(OBJ)
-OFLAGS=-obmilr -oe=24 -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok##x
-FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
+A_FLAGS=-mh -0 -d1
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
+D_FLAGS=-bt=dos -DTARGET_MSDOS=16 -DMSDOS=1 $(S_FLAGS)
+Z_FLAGS=-zk0 -zc -zp8 -zm
+L_FLAGS=-lr -l=dos -v
+C_FLAGS=$(A_FLAGS) $(I_FLAGS) -wo -i$(DOSLIB) $(L_FLAGS) -fo=.$(OBJ)
+O_FLAGS=-obmilr -oe=24 -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok##x
+FLAGS=$(C_FLAGS) $(O_FLAGS) $(D_FLAGS) $(Z_FLAGS)
+
+CPPFLAGS=-DTARGET_MSDOS=16
+AFLAGS=$(WCLQ) -bt=dos -mh -0 -d1 -fo=.$(OBJ)
+CFLAGS=$(WCLQ) -bt=dos -mh -0 -d1 -fo=.$(OBJ) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
+LFLAGS=$(WCLQ) -l=dos
+LIBFLAGS=-b $(WLIBQ)
 
 #
 # objects
@@ -223,21 +230,27 @@ 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)
 
 modex16.$(OBJ): $(SRCLIB)modex16.c $(SRCLIB)modex16.h
 bakapee.$(OBJ): $(SRCLIB)bakapee.c $(SRCLIB)bakapee.h
@@ -301,7 +314,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)
@@ -346,15 +359,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
@@ -371,12 +384,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 .
 
 ##
@@ -386,25 +399,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)