Merge remote-tracking branch 'upstream/master'

[16.git] / makefile

diff --git a/makefile b/makefile
index 1df568138f3843e39c04d4ba69611851d2c40ba0..cf5e2cbe148ce3c40f0bf14a42ba4ee8d37d5dfe 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -75,6 +75,7 @@ CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww
 OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
+PCX2VRL=$(DOSLIBDIR)/hw/vga/pcx2vrl
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
@@ -88,12 +89,10 @@ DOSLIBLIBS=$(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib $(DOSLIBDIR)/hw/dos/dos86h/dos.lib
 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 drawvrl5.exe
 
 all: $(EXEC)
 
-!include $(DOSLIBDIR)/extdep.mak
-
 #$(16LIBOBJS) => 16.lib bug....
 #
 #game and bakapi executables
@@ -113,14 +112,19 @@ scroll.$(OBJ): $(SRC)scroll.c
 
 
 # NOTE: dos86h = 16-bit huge memory model. memory model must match!
-tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ)
+tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
 #      %write tmp.cmd option quiet option map=tesuto.map $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe
 #      %write tmp.cmd library $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib
 #      %write tmp.cmd library $(DOSLIBDIR)/hw/dos/dos86h/dos.lib
 #      @wlink @tmp.cmd
-       wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ)
+       wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
 tesuto.$(OBJ): $(SRC)tesuto.c
        wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
+
+drawvrl5.exe: .symbolic
+       #@cd $(DOSLIB)hw/vga/make.
+       @wmake $(DOSLIBDIR)/hw/vga/dos86h/vga.lib
+       @$(COPYCOMMAND) $(DOSLIBDIR)/hw/vga/dos86h/drawvrl5.exe ./
 #tesuto.exe: tesuto.$(OBJ)
 #      wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
 #tesuto.$(OBJ): $(SRC)tesuto.c
@@ -296,6 +300,9 @@ gfx.lib: $(GFXLIBOBJS)
 vgmsnd.lib: $(VGMSNDOBJ)
        wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
 
+# extdep:
+# !include $(DOSLIBDIR)/extdep.mak
+
 # library deps 16-bit huge
 $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib:
        cd $(DOSLIBDIR)/hw/cpu && ./make.sh
@@ -459,8 +466,9 @@ comq: .symbolic
        @upx -9 $(UPXQ) $(EXEC)
 
 www: .symbolic
-#       @rm /var/www/$(EXEC)
-       @cp ./$(EXEC) /var/www/
+       @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe.zip*'
+       @rm "/var/www/$(EXEC).zip*"
+       #@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/
@@ -468,17 +476,21 @@ www: .symbolic
 getwww: .symbolic
        @x4get.bat $(EXEC)
 
+##
+##     External library management~ ^^
+##
 #git submodule add <repo>
-uplibs: .symbolic
-       @wmake -h updatelibs
+mkdl: .symbolic
+       @cd $(DOSLIB)
+       @./buildall.sh
+       @cd $(PDIR)$(PDIR)$(PDIR)
 
-updatelibs: .symbolic
+uplibs: .symbolic
        @cd $(JSMNLIB)
        @git pull
        @cd $(PDIR)$(PDIR)$(PDIR)
        @cd $(DOSLIB)
        @git pull
-       @./buildall.sh
        @cd $(PDIR)$(PDIR)$(PDIR)
 
 reinitlibs: .symbolic