X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=8997cb349968d04896a4cff2a179938996210fdd;hb=4654652a3086f60c77213d3b54eb660dc80b8971;hp=769da602aeb0f282a7e54155f33296b492ee3dee;hpb=faaff3d710b09849c4a6ea09b10be0a807f0c9f6;p=16.git

diff --git a/makefile b/makefile
index 769da602..8997cb34 100755
--- 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 -zq -zc -zp8# -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,18 +85,21 @@ 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
 #
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
 	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map
 
-bakapi.exe: bakapi.$(OBJ) $(16LIBOBJS) gfx.lib modex.lib
-	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib modex.lib -fm=bakapi.map
+bakapi.exe: bakapi.$(OBJ) gfx.lib modex.lib
+	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib modex.lib -fm=bakapi.map
 #
 #Test Executables!
 #
@@ -102,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)
@@ -265,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
@@ -391,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
@@ -420,38 +427,48 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
 #	@echo $(watcom)
 #	@echo $(INCLUDE)
-	@cd $(DOSLIB)
-	@./clean.sh
-	@cd ../../../
 
 comp: .symbolic
-	@upx -9 -qqq $(EXEC)
-##	@upx -9 -qqq x-demo.exe
+	@upx -9 $(UPXQ) $(EXEC)
+##	@upx -9 $(UPXQ) x-demo.exe
 
 #git submodule add <repo>
+uplibs: .symbolic
+	@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
+	@git clone https://github.com/joncampbell123/doslib.git
+	@git clone https://github.com/zserge/jsmn.git
+	@cd ../../
 
 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/