From: Jiří Malák Date: Sun, 11 Sep 2016 06:22:54 +0000 (+0200) Subject: little bit simplify main build make file X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=18a69bb3ca571787e1cad98545ae0570b55e9ace little bit simplify main build make file --- diff --git a/makefile b/makefile index 7c17104c..22929918 100755 --- 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