X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=0b4e1f974353fb2e7cc2b0f7c8718f0f3c9707ef;hb=11d0edff8ea7936294bc1b220a0456bbeb2eb1f7;hp=d58d2a5ddb0118c68b478cde636e719cc88cd06e;hpb=115f683674ced67bb350edb49cb30eef44a2cc45;p=16.git

diff --git a/makefile b/makefile
index d58d2a5d..0b4e1f97 100755
--- a/makefile
+++ b/makefile
@@ -73,6 +73,7 @@ SPRI=$(DATADIR)/spri
 SRC=src
 UTIL=$(SRC)/util
 GITCONFIGDIR=$(UTIL)/git
+SCRIPTBATDIR=$(UTIL)/shbat
 SRCLIB=$(SRC)/lib
 JSMNLIB=$(SRCLIB)/jsmn
 NYANLIB=$(SRCLIB)/nyan
@@ -215,7 +216,7 @@ SPRIUTILEXEC = &
 	pcxsscut &
 	vrl2vrs &
 	vrsdump
-UTILEXEC += $(SPRIUTILEXEC)
+#UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
 EXEC = &
@@ -223,9 +224,9 @@ EXEC = &
 	bakapi.exe &
 	$(TESTEXEC)
 
-!ifdef __LINUX__
-EXEC += $(SPRIUTILEXEC)
-!endif
+#!ifdef __LINUX__
+#EXEC += $(SPRIUTILEXEC)
+#!endif
 
 ALLEXEC = &
 	$(EXEC) &
@@ -358,6 +359,7 @@ mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_mm.$(OBJ):	 $(SRCLIB)/16_mm.c	$(SRCLIB)/16_mm.h
 16_pm.$(OBJ):	 $(SRCLIB)/16_pm.c	$(SRCLIB)/16_pm.h
 16_ca.$(OBJ):	 $(SRCLIB)/16_ca.c	$(SRCLIB)/16_ca.h
+16_us.$(OBJ):	 $(SRCLIB)/16_us.c
 16_dbg.$(OBJ):	$(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
 midi.$(OBJ):	$(SRCLIB)/midi.c $(SRCLIB)/midi.h
 16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h
@@ -378,13 +380,15 @@ ll.$(OBJ):		$(SRCLIB)/ll.c	$(SRCLIB)/ll.h
 #
 clean: .symbolic
 	@if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
+	@wmake -h initscript
 	@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
 	@if exist *.LIB $(REMOVECOMMAND) *.LIB
 	@. src/util/bcexmm.sh
 	@if exist *.EXE $(REMOVECOMMAND) *.EXE
 	@if exist *.OBJ $(REMOVECOMMAND) *.OBJ
-	@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
+	#@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
+	@if not exist vrl2vrs wmake -h vrs
 !else
 	@if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -416,14 +420,39 @@ clean: .symbolic
 
 nuke: .symbolic
 	@wmake clean
+	@wmake backupscript
 	@wmake cldl
 	@wmake all
 	@wmake comp
 
 backupconfig: .symbolic
-	@$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)git_con.fig
-	@$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)git_modu.les
-	@$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)git_igno.re
+	@$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)/git_con.fig
+	@$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
+	@$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
+
+initconfig: .symbolic
+	@$(COPYCOMMAND) $(GITCONFIGDIR)/git_con.fig .git/config
+	@$(COPYCOMMAND) $(GITCONFIGDIR)/git_modu.les .gitmodules
+	@$(COPYCOMMAND) $(GITCONFIGDIR)/git_igno.re .gitignore
+
+
+backupscript: .symbolic
+	@if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
+	@if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+!ifdef __LINUX__
+	@if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
+	@if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
+!endif
+	@if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh ./
+	@if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT ./
+
+initscript: .symbolic
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
+!ifdef __LINUX__
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
+!endif
+
 
 comp: .symbolic
 	@*upx -9 $(EXEC)
@@ -500,9 +529,7 @@ reinitlibs: .symbolic
 	@wmake -h initlibs
 
 initlibs: .symbolic
-	@$(COPYCOMMAND) $(GITCONFIGDIR)git_con.fig .git/config
-	@$(COPYCOMMAND) $(GITCONFIGDIR)git_modu.les .gitmodules
-	@$(COPYCOMMAND) $(GITCONFIGDIR)git_igno.re .gitignore
+	@wmake -h initconfig
 	@wmake -h getlib
 	@cd 16
 	@git clone https://github.com/FlatRockSoft/CatacombApocalypse.git