16_in improvements and added debugging stuff~~~~

[16.git] / makefile

diff --git a/makefile b/makefile
index a2a11726c07afd25b5b00cd8e2df09dd1d01f4f6..8997cb349968d04896a4cff2a179938996210fdd 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -59,12 +59,16 @@ VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
 DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
+WLIBQ=-q
+WCLQ=-zq $(WLIBQ)
+UPXQ=
+
 AFLAGS=-mh -0 -d1
 16FLAGS=-fh=16.hed
 BAKAPIFLAGS=-fh=bakapi.hed
 SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
-ZFLAGS=-zk0 -zc -zp8# -zq ## -zm
+ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm
 CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##wwww
 OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
@@ -81,10 +85,13 @@ GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(
 TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
 # tsthimem.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
-EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
+EXEC = 16.exe bakapi.exe $(TESTEXEC)
+#tesuto.exe
 
 all: $(EXEC)
 
+#$(16LIBOBJS) => 16.lib
+
 #
 #game and bakapi executables
 #
@@ -92,7 +99,6 @@ all: $(EXEC)
        wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map
 
 bakapi.exe: bakapi.$(OBJ) gfx.lib modex.lib
-#$(16LIBOBJS)
        wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib modex.lib -fm=bakapi.map
 #
 #Test Executables!
@@ -103,9 +109,9 @@ scroll.$(OBJ): $(SRC)scroll.c
        wcl $(FLAGS) -c $(SRC)scroll.c
 
 tesuto.exe: tesuto.$(OBJ)
-       wcl -zq -mh -d2 tesuto.$(OBJ)
+       wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
 tesuto.$(OBJ): $(SRC)tesuto.c
-       wcl -zq -mh -d2 -c $(SRC)tesuto.c
+       wcl $(WCLQ) -mh -d2 -c $(SRC)tesuto.c
 
 #sega.exe: sega.$(OBJ)
 #      wcl $(FLAGS) sega.$(OBJ)
@@ -266,16 +272,16 @@ vgmtest.$(OBJ): $(SRC)vgmtest.c
 #non executable objects libraries
 #
 16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib
-       wlib -b -q $(16LIBOBJS) $(16LIBOBJS)# doslib.lib vgmsnd.lib
+       wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
 
 gfx.lib: $(GFXLIBOBJS)
-       wlib -b -q gfx.lib $(GFXLIBOBJS)
+       wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS)
 
 doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
-       wlib -b -q doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+       wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
 
 vgmsnd.lib: $(VGMSNDOBJ)
-       wlib -b -q vgmsnd.lib $(VGMSNDOBJ)
+       wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
 
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
        wcl $(FLAGS) -c $(SRCLIB)modex16.c
@@ -392,10 +398,10 @@ clean: .symbolic
        @$(REMOVECOMMAND) gfx.lib
        @$(REMOVECOMMAND) doslib.lib
        @$(REMOVECOMMAND) vgmsnd.lib
-       @wlib -n 16.lib
-       @wlib -n  gfx.lib
-       @wlib -n  doslib.lib
-       @wlib -n  vgmsnd.lib
+       @wlib -n $(WLIBQ) 16.lib
+       @wlib -n $(WLIBQ) gfx.lib
+       @wlib -n $(WLIBQ) doslib.lib
+       @wlib -n $(WLIBQ) vgmsnd.lib
        @$(REMOVECOMMAND) *.16
        @$(REMOVECOMMAND) *.16W
        @$(REMOVECOMMAND) *.16B
@@ -423,21 +429,21 @@ clean: .symbolic
 #      @echo $(INCLUDE)
 
 comp: .symbolic
-       @upx -9 $(EXEC)
-##     @upx -9 -qqq x-demo.exe
+       @upx -9 $(UPXQ) $(EXEC)
+##     @upx -9 $(UPXQ) x-demo.exe
 
 #git submodule add <repo>
 uplibs: .symbolic
-       @wmake updatelibs
+       @wmake -h updatelibs
 
 updatelibs: .symbolic
        @cd $(JSMNLIB)
        @git pull
        @cd ../../../
-        @cd $(DOSLIB)
-        @git pull
+       @cd $(DOSLIB)
+       @git pull
        @./buildall.sh
-        @cd ../../../
+       @cd ../../../
 
 initlibs: .symbolic
        @cd src/lib
@@ -447,18 +453,22 @@ initlibs: .symbolic
 
 xlib: .symbolic
        @cd 16/xlib
-       @wmake clean
-       @wmake all
+       @wmake -h clean
+       @wmake -h all
        @cd ../../
 
 mx: .symbolic
        @cd 16/xw
 #      @wmake clean
-       @wmake all
+       @wmake -h all
        @cd ../../
 
 mx_: .symbolic
        @cd 16/xw_
-       @wmake -f makefile all
+       @wmake -h -f makefile all
        @cd ../../
 
+www: .symbolic
+       @rm -f /var/www/$(EXEC)
+       @cp -f $(EXEC) /var/www/
+       @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/