X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=bf3bc8e2256496f95d5ab7f6b88ca02617be2c8d;hb=193a0631b6abadab8323283c4026246bffe9c9bb;hp=697f7707b518557029eaf1420e976543b1d56f0f;hpb=7a5da5a4b3aeaeb6314ace75ada9ef466e5b0468;p=16.git

diff --git a/makefile b/makefile
index 697f7707..bf3bc8e2 100755
--- a/makefile
+++ b/makefile
@@ -32,13 +32,11 @@
 !ifdef __LINUX__
 REMOVECOMMAND=rm -f
 COPYCOMMAND=cp -f
-MOVECOMMAND=mv
 DIRSEP=/
 OBJ=o
 !else
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
-MOVECOMMAND=move /y
 DIRSEP=\
 OBJ=obj
 !endif
@@ -50,7 +48,6 @@ OBJ=obj
 TARGET_OS = dos
 
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
-BIN=bin$(DIRSEP)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
@@ -62,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)
@@ -84,9 +85,12 @@ 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)
 
-all: $(EXEC) comp
+#$(16LIBOBJS) => 16.lib
 
 #
 #game and bakapi executables
@@ -94,8 +98,8 @@ all: $(EXEC) comp
 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!
 #
@@ -105,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)
@@ -268,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 $(WLIB) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
 
 gfx.lib: $(GFXLIBOBJS)
-	wlib -b -q gfx.lib $(GFXLIBOBJS)
+	wlib -b $(WLIB) gfx.lib $(GFXLIBOBJS)
 
 doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
-	wlib -b -q doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+	wlib -b $(WLIB) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
 
 vgmsnd.lib: $(VGMSNDOBJ)
-	wlib -b -q vgmsnd.lib $(VGMSNDOBJ)
+	wlib -b $(WLIB) vgmsnd.lib $(VGMSNDOBJ)
 
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
@@ -388,16 +392,16 @@ modex.$(OBJ): $(MODEXLIB_)modex.asm
 #other~
 #
 clean: .symbolic
-	@$(REMOVECOMMAND) $(BIN)$(EXEC)
+	@$(REMOVECOMMAND) $(EXEC)
 	@$(REMOVECOMMAND) *.$(OBJ)
 	@$(REMOVECOMMAND) 16.lib
 	@$(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 gfx.lib
+	@wlib -n doslib.lib
+	@wlib -n vgmsnd.lib
 	@$(REMOVECOMMAND) *.16
 	@$(REMOVECOMMAND) *.16W
 	@$(REMOVECOMMAND) *.16B
@@ -425,30 +429,46 @@ clean: .symbolic
 #	@echo $(INCLUDE)
 
 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
+	@./buildall.sh
+	@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 ../../
 
-binmove: .symbolic
-	@$(MOVECOMMAND) $(EXEC) $(BIN)$(EXEC)
+www: .symbolic
+	@rm -f /var/www/$(EXEC)
+	@cp -f $(EXEC) /var/www/
+	@scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/