Merge remote-tracking branch 'upstream/master'

[16.git] / makefile

diff --git a/makefile b/makefile
index 7e782770b570109347d69d07c84feb6b5274cd67..229299188fa596d3f1093cf0218c8f4713d60888 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -42,17 +42,17 @@ COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=obj
 DUMP=cat
-DOSLIBMAKE=make.sh
-DOSLIBMAKEALL=buildall.sh
+DOSLIBMAKE=./make.sh
+DOSLIBMAKEALL=./buildall.sh
 !else          #DOS ^^
 to_os_path=/=\
-REMOVECOMMAND=*del
+REMOVECOMMAND=del
 COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
-DOSLIBMAKE=make.bat
-DOSLIBMAKEALL=build.bat
+DOSLIBMAKE=.\make.bat
+DOSLIBMAKEALL=.\build.bat
 !endif
 
 TARGET_OS = dos
@@ -82,7 +82,7 @@ DOSLIB_JOYSTICK=src/lib/doslib/hw/joystick
 # quiet flags
 #
 WLIBQ=-q
-WCLQ=-zq $(WLIBQ)
+WCLQ=-q
 UPXQ=-qqq
 
 #
@@ -259,18 +259,18 @@ gfx.lib: $(GFXLIBOBJS)
 #
 # library deps 16-bit huge
 $(DOSLIB_CPU)/dos86h/cpu.lib:
-       cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_DOS)/dos86h/dos.lib:
-       cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_DOS:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/dos86h/vgatty.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/dos86h/vga.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_8250)/dos86h/8250.lib:
-       cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_8250:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT)
 
 joytest.exe:
-       cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT)
        $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)dos86h$(DIRSEP)test.exe joytest.exe
 
 modex16.$(OBJ):   $(SRCLIB)/modex16.c $(SRCLIB)/modex16.h
@@ -306,32 +306,27 @@ modex.$(OBJ):     $(MODEXLIB)/modex.asm
 #other~
 #
 clean: .symbolic
-       @$(REMOVECOMMAND) $(EXEC)
-       @$(REMOVECOMMAND) *.$(OBJ)
+       @for %f in ($(EXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
        @rm *.LIB
        @. src/util/bcexmm.sh
        @rm *.EXE
-       #@$(REMOVECOMMAND) *.\$\$\$
-       @$(REMOVECOMMAND) *.OBJ
-       @$(REMOVECOMMAND) *.BCO
-!else
-       @*$(REMOVECOMMAND) *.$$$
 !endif
-       @$(REMOVECOMMAND) 16.lib
-       @$(REMOVECOMMAND) gfx.lib
-       @$(REMOVECOMMAND) vgmsnd.lib
-       @*wlib -n $(WLIBQ) 16.lib
-       @*wlib -n $(WLIBQ) gfx.lib
-       @*wlib -n $(WLIBQ) vgmsnd.lib
-##     @$(REMOVECOMMAND) *.16W
-##     @$(REMOVECOMMAND) *.16B
-       @$(REMOVECOMMAND) __wcl__.LNK
-       @$(REMOVECOMMAND) *.SMP
-       @$(REMOVECOMMAND) *.hed
-       @$(REMOVECOMMAND) *.MAH
-       @$(REMOVECOMMAND) *.mah
-       @$(REMOVECOMMAND) *.err
+       @if exist *.obj $(REMOVECOMMAND) *.obj
+       @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
+       @if exist *.bco $(REMOVECOMMAND) *.bco
+       @if exist *.BCO $(REMOVECOMMAND) *.BCO
+       @if exist *.LIB $(REMOVECOMMAND) *.LIB
+       @if exist *.lnk $(REMOVECOMMAND) *.lnk
+       @if exist *.LNK $(REMOVECOMMAND) *.LNK
+       @if exist *.smp $(REMOVECOMMAND) *.smp
+       @if exist *.SMP $(REMOVECOMMAND) *.SMP
+       @if exist *.hed $(REMOVECOMMAND) *.hed
+       @if exist *.mah $(REMOVECOMMAND) *.mah
+       @if exist *.MAH $(REMOVECOMMAND) *.MAH
+       @if exist *.err $(REMOVECOMMAND) *.err
+#      @if exist *.16W $(REMOVECOMMAND) *.16W
+#      @if exist *.16B $(REMOVECOMMAND) *.16B
 
 #      @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #      @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
@@ -416,6 +411,7 @@ initlibs: .symbolic
        @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
+       @git clone https://github.com/FlatRockSoft/Catacomb3D.git
        @cd $(BUILD_ROOT)
        @cp $(DOSLIB)/make-lowercase .