From: Jonathan Campbell <jonathan@castus.tv>
Date: Fri, 25 Mar 2016 01:51:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=849d2ef1b103d6c61905a8746bc8c460e32e5476;hp=-c;p=16.git

Merge remote-tracking branch 'upstream/master'
---

849d2ef1b103d6c61905a8746bc8c460e32e5476
diff --combined makefile
index 4eebe67b,0cd2c115..f035f1c5
--- a/makefile
+++ b/makefile
@@@ -75,7 -75,6 +75,7 @@@ CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -w
  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)
@@@ -119,7 -118,7 +119,7 @@@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS
  #	@wlink @tmp.cmd
  	wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
  tesuto.$(OBJ): $(SRC)tesuto.c
 -	wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
 +	wcl $(FLAGS) $(DOSLIB_CINCLUDE) $(WCLQ) -c $(SRC)tesuto.c
  #tesuto.exe: tesuto.$(OBJ)
  #	wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
  #tesuto.$(OBJ): $(SRC)tesuto.c
@@@ -461,7 -460,8 +461,8 @@@ comq: .symboli
  	@upx -9 $(UPXQ) $(EXEC)
  
  www: .symbolic
- 	#@rm /var/www/$(EXEC)
+ 	@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/