Merge remote-tracking branch 'upstream/master'

[16.git] / makefile

diff --git a/makefile b/makefile
index a602b49e1eb63270d19da53f244d66243d806db3..ac76ae2ab3a641d9f2067eca186397b0aed4597f 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,7 +89,7 @@ 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)
 
@@ -119,6 +120,11 @@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
        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: drawvrl5.$(OBJ) $(DOSLIBLIBS)
+       wcl $(FLAGS) $(WCLQ) drawvrl5.$(OBJ) $(DOSLIBLIBS)
+drawvrl5.$(OBJ): $(SRC)drawvrl5.c
+       wcl $(FLAGS) $(WCLQ) -c $(SRC)drawvrl5.c
 #tesuto.exe: tesuto.$(OBJ)
 #      wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
 #tesuto.$(OBJ): $(SRC)tesuto.c
@@ -460,7 +466,8 @@ comq: .symbolic
        @upx -9 $(UPXQ) $(EXEC)
 
 www: .symbolic
-       @rm /var/www/$(EXEC).zip*
+       @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/