X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=makefile;h=9cac033ac20c649d5426cbd6ea11b3fa3c9493c4;hb=41303bb36fbd96b22c16b3c445bc0cf605eb4113;hp=95acd3bc918bcb9fcdb1d7685eefb7b5163a0775;hpb=24fadbcfdbad9efd936bd80982521e6f8218da7d;p=16.git

diff --git a/makefile b/makefile
index 95acd3bc..9cac033a 100755
--- a/makefile
+++ b/makefile
@@ -42,13 +42,17 @@ COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=obj
 DUMP=cat
+DOSLIBMAKE=make.sh
+DOSLIBMAKEALL=buildall.sh
 !else		#DOS ^^
 to_os_path=/=\
-REMOVECOMMAND=del
+REMOVECOMMAND=*del
 COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
+DOSLIBMAKE=make.bat
+DOSLIBMAKEALL=build.bat
 !endif
 
 TARGET_OS = dos
@@ -56,7 +60,7 @@ TARGET_OS = dos
 BUILD_ROOT=$+$(%__CWD__)$-
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 DATADIR=data$(DIRSEP)
-SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP)
+SPRI=$(DATADIR)/spri
 SRC=src
 SRCLIB=src/lib
 JSMNLIB=src/lib/jsmn
@@ -95,7 +99,7 @@ CPPFLAGS += -DDEBUGSERIAL
 !endif
 AFLAGS=$(WCLQ) $(T_FLAGS)
 CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
-LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah -lr
+LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah $(S_FLAGS)
 LIBFLAGS=$(WLIBQ) -b -n
 
 #
@@ -141,7 +145,7 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 
 #CFLAGS is neccessary here
 .obj.exe :
-	*wcl $(CFLAGS) $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
+	*wcl $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
 
 .obj.lib :
 	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
@@ -247,28 +251,24 @@ vgmsnd.lib: $(VGMSNDOBJ)
 gfx.lib: $(GFXLIBOBJS)
 	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
 
-# extdep:
-# !include $(DOSLIBDIR)$(DIRSEP)extdep.mak
-
+#
+#	doslib
+#
 # 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)
+	cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
 	$(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)dos86h$(DIRSEP)test.exe joytest.exe
-#$(DOSLIBLIBS): .symbolic
-#	@cd $(DOSLIB:$(to_os_path))
-#	@.$(DIRSEP)buildall.sh
-#	@cd $(BUILD_ROOT)
 
 modex16.$(OBJ):   $(SRCLIB)/modex16.c $(SRCLIB)/modex16.h
 bakapee.$(OBJ):   $(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
@@ -306,8 +306,11 @@ clean: .symbolic
 	@$(REMOVECOMMAND) *.$(OBJ)
 !ifdef __LINUX__
 	@rm *.LIB
+	@. src/util/bcexmm.sh
 	@rm *.EXE
 	#@$(REMOVECOMMAND) *.\$\$\$
+	@$(REMOVECOMMAND) *.OBJ
+	@$(REMOVECOMMAND) *.BCO
 !else
 	@*$(REMOVECOMMAND) *.$$$
 !endif
@@ -317,23 +320,15 @@ clean: .symbolic
 	@*wlib -n $(WLIBQ) 16.lib
 	@*wlib -n $(WLIBQ) gfx.lib
 	@*wlib -n $(WLIBQ) vgmsnd.lib
-	@$(REMOVECOMMAND) *.16W
-	@$(REMOVECOMMAND) *.16B
-	@$(REMOVECOMMAND) *.OBJ
-	@$(REMOVECOMMAND) *.o
-	@$(REMOVECOMMAND) *.BCO
-	#@$(REMOVECOMMAND) makefi~1
-	#@$(REMOVECOMMAND) makefile~
+##	@$(REMOVECOMMAND) *.16W
+##	@$(REMOVECOMMAND) *.16B
 	@$(REMOVECOMMAND) __wcl__.LNK
-#	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
 	@$(REMOVECOMMAND) *.hed
 	@$(REMOVECOMMAND) *.MAH
 	@$(REMOVECOMMAND) *.mah
 	@$(REMOVECOMMAND) *.err
-	#@cd $(DOSLIB:$(to_os_path))
-	#@./buildall.sh clean
-	#@cd $(BUILD_ROOT)
+
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -341,8 +336,12 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
-#	@echo $(watcom)
-#	@echo $(INCLUDE)
+
+nuke: .symbolic
+	@wmake clean
+	@wmake cldl
+	@wmake all
+	@wmake comp
 
 backupconfig: .symbolic
 	@$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
@@ -377,7 +376,12 @@ vomitchan: .symbolic
 #git submodule add <repo>
 mkdl: .symbolic
 	@cd $(DOSLIB:$(to_os_path))
-	@./buildall.sh
+	@$(DOSLIBMAKEALL)
+	@cd $(BUILD_ROOT)
+
+cldl: .symbolic
+	@cd $(DOSLIB:$(to_os_path))
+	@$(DOSLIBMAKEALL) clean
 	@cd $(BUILD_ROOT)
 
 uplibs: .symbolic
@@ -389,8 +393,8 @@ uplibs: .symbolic
 	@cd $(BUILD_ROOT)
 
 reinitlibs: .symbolic
-	@rm -rf $(SRCLIB)doslib
-	@rm -rf $(SRCLIB)jsmn
+	@rm -rf $(DOSLIB)
+	@rm -rf $(JSMNLIB)
 	@rm -rf 16/CatacombApocalypse
 	@rm -rf 16/wolf3d
 	@rm -rf 16/keen