X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=82bab4d35e3386d991d38781e3b5953adbff8ee1;hb=26536b16d4825df06a4e73380985afb3a0bfb7e4;hp=2632b8b803171052d8efb12c46cc8071c73f3816;hpb=f6d0f26f669392f2970eb91d744fb88651583cf3;p=16.git

diff --git a/makefile b/makefile
index 2632b8b8..82bab4d3 100755
--- a/makefile
+++ b/makefile
@@ -24,6 +24,11 @@
 # -zk0u	translate kanji to unicode... wwww
 # -zk0	kanji support~
 # -zkl		current codepage
+# -zd{f,p} DS floats vs DS pegged to DGROUP
+# -zu SS != DGROUP
+# -zp{1,2,4,8,16} struct packing align.
+# -ei force enums to be type int
+# -wo diagnose problems in overlaid code
 
 # this enables debug output to the serial port.
 # comment this out on game release.
@@ -31,6 +36,8 @@
 # serial output is plain text ASCII.
 DEBUGSERIAL=1
 
+DELLOGFILE=1
+
 #192x144
 #wwww will add these
 !ifdef __LINUX__
@@ -38,6 +45,7 @@ DEBUGSERIAL=1
 to_os_path=\=/
 REMOVECOMMAND=rm -f
 COPYCOMMAND=cp -f
+MOVECOMMAND=mv
 DIRSEP=/
 OBJ=obj
 DUMP=cat
@@ -47,6 +55,7 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
+MOVECOMMAND=move
 DIRSEP=\
 OBJ=obj
 DUMP=type
@@ -104,10 +113,10 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768
-Z_FLAGS=-zk0 -zc -zp8 -zm
-O_FLAGS=-opn -oe=24 -oil+ -outback -ohm				-zp4##-ei -or
-T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ) ##-e=65536
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k24576#32768
+Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
+O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
+T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)##-e=65536
 
 DBUGFLAGS=-fm=$^&.meh -fd=$^&
 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
@@ -206,7 +215,7 @@ SPRIUTILEXEC = &
 	pcxsscut &
 	vrl2vrs &
 	vrsdump
-UTILEXEC += $(SPRIUTILEXEC)
+#UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
 EXEC = &
@@ -214,9 +223,9 @@ EXEC = &
 	bakapi.exe &
 	$(TESTEXEC)
 
-!ifdef __LINUX__
-EXEC += $(SPRIUTILEXEC)
-!endif
+#!ifdef __LINUX__
+#EXEC += $(SPRIUTILEXEC)
+#!endif
 
 ALLEXEC = &
 	$(EXEC) &
@@ -375,7 +384,8 @@ clean: .symbolic
 	@. 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
@@ -388,13 +398,15 @@ clean: .symbolic
 	@if exist *.smp $(REMOVECOMMAND) *.smp
 	@if exist *.SMP $(REMOVECOMMAND) *.SMP
 	@if exist *.hed $(REMOVECOMMAND) *.hed
-	@if exist *.mah $(REMOVECOMMAND) *.mah
-	@if exist *.MAH $(REMOVECOMMAND) *.MAH
+	@if exist *.meh $(REMOVECOMMAND) *.meh
+	@if exist *.MEH $(REMOVECOMMAND) *.MEH
 	@if exist *.err $(REMOVECOMMAND) *.err
 	@if exist TC*.SWP $(REMOVECOMMAND) TC*.SWP
-#	@if exist *.16W $(REMOVECOMMAND) *.16W
-#	@if exist *.16B $(REMOVECOMMAND) *.16B
-
+!ifeq DELLOGFILE 1
+	@if exist *.16W $(REMOVECOMMAND) *.16W
+	@if exist *.16B $(REMOVECOMMAND) *.16B
+	@if exist *.L16 $(REMOVECOMMAND) *.L16
+!endif
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -422,10 +434,11 @@ comq: .symbolic
 
 www: .symbolic
 	@for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
-	@$(REMOVECOMMAND) /var/www/*.exe.zip*
+	@$(REMOVECOMMAND) /var/www/*.exe.zi*
+	@$(REMOVECOMMAND) /var/www/*.zip.zi*
 	@for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
 	@./src/util/z.sh $(EXEC) $(EXEC)
-	@./src/util/z.sh data data
+	@./src/util/z2.sh data.zip data
 	@wmake -h wwwext
 
 wwwext: .symbolic