X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=2953ddf29d6d3a453d0860b17f612584e55403da;hb=4d26636d47369d4b39d8e0e8262ba0ca9983e45b;hp=f97dce255774bf9a120a3e31ecafa835e295916e;hpb=d6bf85570f22605fec8f47fc66f19eb5ac9a7c03;p=16.git

diff --git a/makefile b/makefile
index f97dce25..2953ddf2 100755
--- a/makefile
+++ b/makefile
@@ -55,12 +55,12 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
-MOVECOMMAND=move
+MOVECOMMAND=move /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
-DOSLIBMAKE=.\make.bat
-DOSLIBMAKEALL=.\build.bat
+DOSLIBMAKE=make.bat build all
+DOSLIBMAKEALL=buildall.bat build all
 !endif
 
 TARGET_OS = dos
@@ -71,9 +71,9 @@ BUILD_ROOT=$+$(%__CWD__)$-
 DATADIR=data/
 SPRI=$(DATADIR)/spri
 SRC=src
-UTIL=$(SRC)/util
+UTIL=$(SRC)$(DIRSEP)util
 GITCONFIGDIR=$(UTIL)/git
-SCRIPTBATDIR=$(UTIL)/shbat
+SCRIPTBATDIR=$(UTIL)$(DIRSEP)shbat
 SRCLIB=$(SRC)/lib
 JSMNLIB=$(SRCLIB)/jsmn
 NYANLIB=$(SRCLIB)/nyan
@@ -250,11 +250,13 @@ EXEC = &
 	16.exe &
 	bakapi.exe &
 	$(TESTEXEC) &
-	$(UTILEXEC)
+	$(UTILEXEC) &
+	$(DOSLIBTESTEXEC)
 
-#!ifdef __LINUX__
-#EXEC += $(SPRIUTILEXEC)
-#!endif
+!ifdef __LINUX__
+#++?EXEC += $(SPRIUTILEXEC)
+#EXEC += $(DOSLIBTESTEXEC)
+!endif
 
 ALLEXEC = &
 	$(EXEC) &
@@ -552,31 +554,48 @@ initconfig: .symbolic
 
 backupscript: .symbolic
 	@$(COPYCOMMAND) WBUILD.BAT WBUILD.B
-	@$(COPYCOMMAND) wbuild.sh wbuild.s
 	@if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
-	@if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
 	@$(MOVECOMMAND) WBUILD.B WBUILD.BAT
-	@$(MOVECOMMAND) wbuild.s wbuild.sh
+
 !ifdef __LINUX__
+	@$(COPYCOMMAND) wbuild.sh wbuild.s
+	@if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+	@$(MOVECOMMAND) wbuild.s wbuild.sh
+
 	@if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
-	@if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
+	@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 ./
+	@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 ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.bat .
 !ifdef __LINUX__
-	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.sh .
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT .
 !endif
 
 
 comp: .symbolic
-	@*upx -9 $(EXEC)
+	@wmake -s -h exe2e
+	@*upx -9 *.exe#$(EXEC)
+	@wmake -s -h e2exe
 
 comq: .symbolic
-	@*upx -9 $(UPXQ) $(EXEC)
+	@wmake -s -h exe2e
+	@*upx -9 $(UPXQ) *.exe#$(EXEC)
+	@wmake -s -h e2exe
+
+exe2e: .symbolic
+	@for %f in ($(ALLEXEC)) do @if exist %f $(MOVECOMMAND) %f $(SRCLIB)
+!ifdef __LINUX__
+	@if exist *.EXE ./make-lowercase *.EXE
+!endif
+	@if exist *.exe $(MOVECOMMAND) *.exe $(SRC)
+	@if exist $(SRCLIB)/*.exe $(MOVECOMMAND) $(SRCLIB)/*.exe .
+
+e2exe: .symbolic
+	@if exist $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
 
 www: .symbolic
 	@if exist 16.exe @wmake -s -h wwwdo