a cute image added

[16.git] / makefile

diff --git a/makefile b/makefile
index 8ec793dffaf400f83f7a06f92b2958311f2dd559..935fbefd25b05c1228af0ba721c1d8c2b4079974 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -48,6 +48,7 @@ OBJ=obj
 TARGET_OS = dos
 
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
+PDIR=..$(DIRSEP)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
@@ -61,7 +62,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 WLIBQ=-q
 WCLQ=-zq $(WLIBQ)
-UPXQ=
+UPXQ=-qqq
 
 AFLAGS=-mh -0 -d1
 16FLAGS=-fh=16.hed
@@ -77,9 +78,8 @@ FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
-16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) timer.$(OBJ)
-#
-#3812intf.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
+
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ)
 
 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
@@ -89,7 +89,7 @@ EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
 
 all: $(EXEC)
 
-#$(16LIBOBJS) => 16.lib
+#$(16LIBOBJS) => 16.lib bug....
 
 #
 #game and bakapi executables
@@ -153,11 +153,11 @@ tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
 pcxtest.exe: pcxtest.$(OBJ) gfx.lib
        wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map
 
-palettec.exe: palettec.$(OBJ) $(16LIBOBJS) gfx.lib
-       wcl $(FLAGS) palettec.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettec.map
+palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS)
+       wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.map #$(16LIBOBJS)
 
-palettel.exe: palettel.$(OBJ) $(16LIBOBJS) gfx.lib
-       wcl $(FLAGS) palettel.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettel.map
+palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS)
+       wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.map #$(16LIBOBJS)
 
 pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
        wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map
@@ -312,8 +312,8 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
        wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
-timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
-       wcl $(FLAGS) -c $(SRCLIB)timer.c
+16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c
+       wcl $(FLAGS) -c $(SRCLIB)16_timer.c
 
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
        wcl $(FLAGS) -c $(SRCLIB)16_in.c
@@ -428,8 +428,20 @@ clean: .symbolic
 #      @echo $(INCLUDE)
 
 comp: .symbolic
+       @upx -9 $(EXEC)
+
+comq: .symbolic
        @upx -9 $(UPXQ) $(EXEC)
-##     @upx -9 $(UPXQ) x-demo.exe
+
+www: .symbolic
+#       @rm /var/www/$(EXEC)
+       @cp ./$(EXEC) /var/www/
+       @./z.sh $(EXEC) $(EXEC)
+       @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/
+       @scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/
+
+getwww: .symbolic
+       @x4get.bat $(EXEC)
 
 #git submodule add <repo>
 uplibs: .symbolic
@@ -438,39 +450,41 @@ uplibs: .symbolic
 updatelibs: .symbolic
        @cd $(JSMNLIB)
        @git pull
-       @cd ../../../
+       @cd $(PDIR)$(PDIR)$(PDIR)
        @cd $(DOSLIB)
        @git pull
        @./buildall.sh
-       @cd ../../../
+       @cd $(PDIR)$(PDIR)$(PDIR)
+
+reinitlibs: .symbolic
+       @rm -rf $(SRCLIB)doslib
+       @rm -rf $(SRCLIB)jsmn
+       @mkdir $(SRCLIB)doslib
+       @mkdir $(SRCLIB)jsmn
+       @wmake -h initlibs
 
 initlibs: .symbolic
-       @cd src/lib
+       @cd $(SRCLIB)
        @git clone https://github.com/joncampbell123/doslib.git
        @git clone https://github.com/zserge/jsmn.git
-       @cd ../../
+       @cd $(PDIR)$(PDIR)
 
+##
+##     experimental libs
+##
 xlib: .symbolic
        @cd 16/xlib
        @wmake -h clean
        @wmake -h all
-       @cd ../../
+       @cd $(PDIR)$(PDIR)
 
 mx: .symbolic
        @cd 16/xw
 #      @wmake clean
        @wmake -h all
-       @cd ../../
+       @cd $(PDIR)$(PDIR)
 
 mx_: .symbolic
        @cd 16/xw_
        @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/
-       @bash ./z.sh $(EXEC) $(EXEC)
-       @scp -r -P 26 *.exe.zip.* 4ch.mooo.com:/var/www/16/
-       
+       @cd $(PDIR)$(PDIR)