Merge remote-tracking branch 'upstream/master'

[16.git] / makefile

diff --git a/makefile b/makefile
index a1f33f6914b3281329c6820616eaae8da986f2b0..229299188fa596d3f1093cf0218c8f4713d60888 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -42,8 +42,8 @@ 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
@@ -51,8 +51,8 @@ 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
@@ -312,12 +312,10 @@ clean: .symbolic
        @. src/util/bcexmm.sh
        @rm *.EXE
 !endif
-       @if exist *.$$$$$$ $(REMOVECOMMAND) *.$$$$$$
        @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 *.LIB $(REMOVECOMMAND) *.LIB
        @if exist *.lnk $(REMOVECOMMAND) *.lnk
        @if exist *.LNK $(REMOVECOMMAND) *.LNK