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
# objects
#
VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-OLDLIBOBJS=bitmap.$(OBJ) mapread.$(OBJ) 16render.$(OBJ)
+OLDLIBOBJS=bitmap.$(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)
+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)
#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
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/
@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
@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