From e4cc52504f683c4de1feb5769a039f02961194a6 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 29 Aug 2016 18:30:14 -0500 Subject: [PATCH] doslib part of p16 now can be compiled in dos ww i think --- makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/makefile b/makefile index 716ad979..ad14b614 100755 --- a/makefile +++ b/makefile @@ -42,13 +42,15 @@ COPYCOMMAND=cp -f DIRSEP=/ OBJ=obj DUMP=cat +DOSLIBMAKE=make.sh !else #DOS ^^ to_os_path=/=\ -REMOVECOMMAND=del +REMOVECOMMAND=*del COPYCOMMAND=copy /y DIRSEP=\ OBJ=obj DUMP=type +DOSLIBMAKE=make.bat !endif TARGET_OS = dos @@ -252,15 +254,15 @@ gfx.lib: $(GFXLIBOBJS) # library deps 16-bit huge $(DOSLIB_CPU)/dos86h/cpu.lib: - cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_DOS)/dos86h/dos.lib: - cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_VGA)/dos86h/vgatty.lib: - cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_VGA)/dos86h/vga.lib: - cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_8250)/dos86h/8250.lib: - cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT) joytest.exe: cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) -- 2.39.2