reverted to makefile.med until issue is solved makefile.meb is the debugging make...

[16.git] / makefile.med

diff --git a/makefile.med b/makefile.med
index e37e64bbc89aa15bdc03ea3f26388d571cc70948..28c80b077c67f76cdcb8bf4e86916c3f33791e66 100755 (executable)
--- a/makefile.med
+++ b/makefile.med
@@ -425,20 +425,26 @@ modex.$(OBJ): $(MODEXLIB_)modex.asm
 clean: .symbolic\r
        @$(REMOVECOMMAND) $(EXEC)\r
        @$(REMOVECOMMAND) *.$(OBJ)\r
+!ifdef __LINUX__\r
+       @rm *.LIB\r
+       @rm *.EXE\r
+       #@$(REMOVECOMMAND) *.\$\$\$\r
+!else\r
+       @*$(REMOVECOMMAND) *.$$$\r
+!endif\r
        @$(REMOVECOMMAND) 16.lib\r
        @$(REMOVECOMMAND) gfx.lib\r
        @$(REMOVECOMMAND) vgmsnd.lib\r
-       @wlib -n $(WLIBQ) 16.lib\r
-       @wlib -n $(WLIBQ) gfx.lib\r
-       @wlib -n $(WLIBQ) vgmsnd.lib\r
-       @$(REMOVECOMMAND) *.16\r
+       @*wlib -n $(WLIBQ) 16.lib\r
+       @*wlib -n $(WLIBQ) gfx.lib\r
+       @*wlib -n $(WLIBQ) vgmsnd.lib\r
        @$(REMOVECOMMAND) *.16W\r
        @$(REMOVECOMMAND) *.16B\r
        @$(REMOVECOMMAND) *.OBJ\r
        @$(REMOVECOMMAND) *.o\r
        @$(REMOVECOMMAND) *.BCO\r
-       @$(REMOVECOMMAND) makefi~1\r
-       @$(REMOVECOMMAND) makefile~\r
+       #@$(REMOVECOMMAND) makefi~1\r
+       #@$(REMOVECOMMAND) makefile~\r
        @$(REMOVECOMMAND) __wcl__.LNK\r
 #      @$(REMOVECOMMAND) *.smp\r
        @$(REMOVECOMMAND) *.SMP\r
@@ -446,9 +452,9 @@ clean: .symbolic
        @$(REMOVECOMMAND) *.MAH\r
        @$(REMOVECOMMAND) *.mah\r
        @$(REMOVECOMMAND) *.err\r
-       #@cd $(DOSLIB)\r
+       #@cd $(DOSLIB:$(to_os_path))\r
        #@./buildall.sh clean\r
-       #@cd $(PDIR)$(PDIR)$(PDIR)\r
+       #@cd $(BUILD_ROOT)\r
 #      @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)\r
 #      @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)\r
 #      @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)\r
@@ -465,10 +471,10 @@ backupconfig: .symbolic
        @$(COPYCOMMAND) .gitignore git_igno.re\r
 \r
 comp: .symbolic\r
-       @upx -9 $(EXEC)\r
+       @*upx -9 $(EXEC)\r
 \r
 comq: .symbolic\r
-       @upx -9 $(UPXQ) $(EXEC)\r
+       @*upx -9 $(UPXQ) $(EXEC)\r
 \r
 www: .symbolic\r
        @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe*'\r
@@ -481,7 +487,7 @@ www: .symbolic
        @scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/\r
 \r
 getwww: .symbolic\r
-       @x4get.bat $(EXEC)\r
+       *x4get.bat $(EXEC)\r
 \r
 vomitchan: .symbolic\r
        @$(DUMP) *.err\r
@@ -491,17 +497,17 @@ vomitchan: .symbolic
 ##\r
 #git submodule add <repo>\r
 mkdl: .symbolic\r
-       @cd $(DOSLIB)\r
+       @cd $(DOSLIB:$(to_os_path))\r
        @./buildall.sh\r
-       @cd $(PDIR)$(PDIR)$(PDIR)\r
+       @cd $(BUILD_ROOT)\r
 \r
 uplibs: .symbolic\r
-       @cd $(JSMNLIB)\r
+       @cd $(JSMNLIB:$(to_os_path))\r
        @git pull\r
-       @cd $(PDIR)$(PDIR)$(PDIR)\r
-       @cd $(DOSLIB)\r
+       @cd $(BUILD_ROOT)\r
+       @cd $(DOSLIB:$(to_os_path))\r
        @git pull\r
-       @cd $(PDIR)$(PDIR)$(PDIR)\r
+       @cd $(BUILD_ROOT)\r
 \r
 reinitlibs: .symbolic\r
        @rm -rf $(SRCLIB)doslib\r
@@ -515,16 +521,16 @@ initlibs: .symbolic
        @cp git_con.fig .git/config\r
        @cp git_modu.les .gitmodules\r
        @cp git_igno.re .gitignore\r
-       @cd $(SRCLIB)\r
+       @cd $(SRCLIB:$(to_os_path))\r
        @git clone https://github.com/joncampbell123/doslib.git\r
        @git clone https://github.com/zserge/jsmn.git\r
-       @cd $(PDIR)$(PDIR)\r
+       @cd $(BUILD_ROOT)\r
        @cd 16\r
        @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git\r
        @git clone https://github.com/id-Software/wolf3d.git\r
        @git clone https://github.com/keendreams/keen.git\r
-       @cd $(PDIR)\r
-       @cp $(SRCLIB)doslib/make-lowercase .\r
+       @cd $(BUILD_ROOT)\r
+       @cp $(DOSLIB)/make-lowercase .\r
 \r
 ##\r
 ##     experimental libs\r
@@ -533,25 +539,25 @@ xlib: .symbolic
        @cd 16$(DIRSEP)xlib\r
        @wmake -h clean\r
        @wmake -h all\r
-       @cd $(PDIR)$(PDIR)\r
+       @cd $(BUILD_ROOT)\r
 \r
 mx: .symbolic\r
        @cd 16$(DIRSEP)xw\r
 #      @wmake clean\r
        @wmake -h all\r
-       @cd $(PDIR)$(PDIR)\r
+       @cd $(BUILD_ROOT)\r
 \r
 mx_: .symbolic\r
        @cd 16$(DIRSEP)xw_\r
        @wmake -h -f makefile all\r
-       @cd $(PDIR)$(PDIR)\r
+       @cd $(BUILD_ROOT)\r
 \r
 vrs: .symbolic\r
-       @cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga\r
+       @cd $(DOSLIB_VGA:$(to_os_path))\r
        #@make clean\r
        @make all\r
-       @mv pcx2vrl ../../../../../\r
-       @mv pcxsscut ../../../../../\r
-       @mv vrl2vrs ../../../../../\r
-       @mv vrsdump ../../../../../\r
-       @cd ../../../../../\r
+       @mv pcx2vrl $(BUILD_ROOT)$(DIRSEP)\r
+       @mv pcxsscut $(BUILD_ROOT)$(DIRSEP)\r
+       @mv vrl2vrs $(BUILD_ROOT)$(DIRSEP)\r
+       @mv vrsdump $(BUILD_ROOT)$(DIRSEP)\r
+       @cd $(BUILD_ROOT)\r