doslib update

[16.git] / makefile

diff --git a/makefile b/makefile
index 1c1cd5cede9e1039ae11d302d48b81c51cf238c0..7e80e902f1fe9faccb0fbbbd53ec3ce3eabba7d0 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 build all dos86h
+DOSLIBMAKEALL=./buildall.sh build all dos86h
 !else          #DOS ^^
 to_os_path=/=\
 REMOVECOMMAND=del
@@ -106,10 +106,10 @@ LIBFLAGS=$(WLIBQ) -b -n
 # objects
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-OLDLIBOBJS=bitmap.$(OBJ) mapread.$(OBJ) 16render.$(OBJ)
-GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ)
-#16planar.$(OBJ) planar.$(OBJ)
+OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
+GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) 16_scr.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
+16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ)
+#16planar.$(OBJ) planar.$(OBJ) mapread.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -161,9 +161,9 @@ TESTEXEC = &
        vgmtest.exe &
        scroll.exe &
        zcroll.exe &
+       inputest.exe &
        vrstest.exe
 TESTEXEC2 = &
-       inputest.exe &
        maptest.exe &
        fmemtest.exe &
        fonttest.exe &
@@ -291,7 +291,7 @@ bakapee.$(OBJ):$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
 16_sprit.$(OBJ):$(SRCLIB)/16_sprit.c $(SRCLIB)/16_sprit.h
 bitmap.$(OBJ): $(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h
 planar.$(OBJ): $(SRCLIB)/planar.c $(SRCLIB)/planar.h
-scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
+16_scr.$(OBJ):$(SRCLIB)/16_scr.c $(SRCLIB)/16_scr.h
 16text.$(OBJ): $(SRCLIB)/16text.c
 mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
@@ -318,6 +318,7 @@ modex.$(OBJ):        $(MODEXLIB)/modex.asm
 #other~
 #
 clean: .symbolic
+       @if not exist $(DOSLIB)/buildall.sh wmake -h initlibs
        @for %f in ($(EXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
        @rm *.LIB
@@ -367,9 +368,9 @@ comq: .symbolic
 
 www: .symbolic
        @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe*'
-       #@rm -f /var/www/$(EXEC)*
-       @rm -f /var/www/*.exe.zip*
-       #@cp ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP)
+       #@$(REMOVECOMMAND) -f /var/www/$(EXEC)*
+       @$(REMOVECOMMAND) -f /var/www/*.exe.zip*
+       #@$(COPYCOMMAND) ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP)
        @./src/util/z.sh $(EXEC) $(EXEC)
        @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/
        @scp -r -P 26 x4get.bat 4ch.mooo.com:/var/www/16/
@@ -404,18 +405,18 @@ uplibs: .symbolic
        @cd $(BUILD_ROOT)
 
 reinitlibs: .symbolic
-       @rm -rf $(DOSLIB)
-       @rm -rf $(JSMNLIB)
-       @rm -rf 16/CatacombApocalypse
-       @rm -rf 16/wolf3d
-       @rm -rf 16/keen
-       @rm -rf 16/Catacomb3D
+       @$(REMOVECOMMAND) -rf $(DOSLIB)
+       @$(REMOVECOMMAND) -rf $(JSMNLIB)
+       @$(REMOVECOMMAND) -rf 16/CatacombApocalypse
+       @$(REMOVECOMMAND) -rf 16/wolf3d
+       @$(REMOVECOMMAND) -rf 16/keen
+       @$(REMOVECOMMAND) -rf 16/Catacomb3D
        @wmake -h initlibs
 
 initlibs: .symbolic
-       @cp git_con.fig .git/config
-       @cp git_modu.les .gitmodules
-       @cp git_igno.re .gitignore
+       @$(COPYCOMMAND) git_con.fig .git/config
+       @$(COPYCOMMAND) git_modu.les .gitmodules
+       @$(COPYCOMMAND) git_igno.re .gitignore
        @cd $(SRCLIB:$(to_os_path))
        @git clone https://github.com/joncampbell123/doslib.git
        @git clone https://github.com/zserge/jsmn.git
@@ -426,7 +427,7 @@ initlibs: .symbolic
        @git clone https://github.com/keendreams/keen.git
        @git clone https://github.com/FlatRockSoft/Catacomb3D.git
        @cd $(BUILD_ROOT)
-       @cp $(DOSLIB)/make-lowercase .
+       @$(COPYCOMMAND) $(DOSLIB)/make-lowercase .
 
 ##
 ##     experimental libs