X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=e6f0d7d624ed60f097052a50c6f7331df3b19d8a;hb=fbdac152a2cab1524281a702ddd16f38625cde27;hp=21bdfacc14a020ab71be2fb9b1c55858a9781a15;hpb=230b56dabb4ef687f1fd21babdfdef58e2484abb;p=16.git

diff --git a/makefile b/makefile
index 21bdfacc..e6f0d7d6 100755
--- a/makefile
+++ b/makefile
@@ -82,11 +82,17 @@ DOSLIB_JOYSTICK=$(DOSLIBDIR)/hw/joystick
 DOSLIB_MEMMODE=dos86$(MEMORYMODE)
 
 # remote host (for sparky4)
-HOSTUSER=wwc001
-HOSTADDR=beta.latech.edu
-HOSTDIR=~/public_html/
+HOSTUSER=sparky4
+HOSTADDR=4ch.mooo.com
+HOSTDIR=/var/www/
 #ssh port
-HOSTPORT=22
+HOSTPORT=26
+# 2nd remote host (for sparky4)
+HOST2USER=wwc001
+HOST2ADDR=beta.latech.edu
+HOST2DIR=~/public_html/
+#ssh port
+HOST2PORT=22
 
 #
 # quiet flags
@@ -100,7 +106,7 @@ UPXQ=-qqq
 #
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768
 Z_FLAGS=-zk0 -zc -zp8 -zm
-O_FLAGS=-obmilr -oe=24 -outpack -ei -ohnl+				-zp4
+O_FLAGS=-opmilr -oe=24 -outback -ei -ohnl+				-zp4
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1##-fo=.$(OBJ) -e=65536
 
 DBUGFLAGS=-fm=$^&.mah -fd=$^&
@@ -171,6 +177,7 @@ EXTERNTESTEXEC = &
 	wcpu.exe &
 	db.exe
 TESTEXEC = &
+	test.exe &
 	tesuto.exe &
 	0.exe &
 	exmmtest.exe &
@@ -178,20 +185,30 @@ TESTEXEC = &
 	scroll.exe &
 	zcroll.exe &
 	inputest.exe &
+	pcxtest.exe &
 	vrstest.exe
 TESTEXEC2 = &
 	maptest.exe &
 	fmemtest.exe &
 	fonttest.exe &
 	fontgfx.exe &
-	test.exe &
 	test0.exe &
-	pcxtest.exe &
-	pcxtest2.exe &
 	$(EXTERNTESTEXEC)
+TESTEXEC3= &
+	pcxtest2.exe
 UTILEXEC = &
 	palettel.exe &
+	palllist.exe &
 	palettec.exe
+!ifdef __LINUX__
+SPRIUTILEXEC = &
+	pcx2vrl &
+	pcxsscut &
+	vrl2vrs &
+	vrsdump
+#UTILEXEC += $(SPRIUTILEXEC)
+!endif
+
 EXEC = &
 	16.exe &
 	bakapi.exe &
@@ -229,11 +246,12 @@ inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIB)
 pcxtest.exe:	pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 #vgacamm.exe:	vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-palettec.exe:	 palettec.$(OBJ) gfx.lib $(DOSLIB)
-palettel.exe:	 palettel.$(OBJ) gfx.lib $(DOSLIB)
+palettec.exe:	palettec.$(OBJ) gfx.lib $(DOSLIB)
+palettel.exe:	 	palettel.$(OBJ) gfx.lib $(DOSLIB)
+palllist.exe:	 	palllist.$(OBJ) gfx.lib $(DOSLIB)
 pcxtest2.exe:	 pcxtest2.$(OBJ) gfx.lib $(DOSLIB)
 #planrpcx.exe:	planrpcx.$(OBJ) gfx.lib
-maptest.exe:	maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
+maptest.exe:	maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 fmemtest.exe:	 fmemtest.$(OBJ)
 exmmtest.exe:	 exmmtest.$(OBJ) $(16LIB) $(DOSLIB)
 vgmtest.exe:	vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB)
@@ -253,8 +271,9 @@ vrstest.$(OBJ):$(SRC)/vrstest.c $(SRCLIB)/16_vl.h
 #vgacamm.$(OBJ):$(SRC)/vgacamm.c $(SRCLIB)/16_vl.h
 #planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/16_vl.h
 pcxtest2.$(OBJ):$(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h
-palettec.$(OBJ):$(SRC)/palettec.c
-palettel.$(OBJ):$(SRC)/palettel.c
+palettec.$(OBJ):	$(SRC)/palettec.c
+palettel.$(OBJ):	$(SRC)/palettel.c
+palllist.$(OBJ):	$(SRC)/palllist.c
 maptest.$(OBJ):$(SRC)/maptest.c $(SRCLIB)/16_vl.h
 #emmtest.$(OBJ):$(SRC)/emmtest.c
 #emsdump.$(OBJ):$(SRC)/emsdump.c
@@ -395,9 +414,14 @@ www: .symbolic
 
 wwwext: .symbolic
 	####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'
+	#4ch.mooo.com
 	@scp -r -P $(HOSTPORT) *.exe $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
 	@scp -r -P $(HOSTPORT) *get.bat $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
 	@scp -r -P $(HOSTPORT) /var/www/*.exe.zip.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+	#beta.latech.edu
+	@scp -r -P $(HOST2PORT) *.exe $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+	@scp -r -P $(HOST2PORT) *get.bat $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+	@scp -r -P $(HOST2PORT) /var/www/*.exe.zip.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
 
 getwww: .symbolic
 	*x4get.bat $(EXEC)
@@ -410,12 +434,12 @@ vomitchan: .symbolic
 ##
 #git submodule add <repo>
 mkdl: .symbolic
-	@cd $(DOSLIB:$(to_os_path))
+	@cd $(DOSLIBDIR:$(to_os_path))
 	@$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE)
 	@cd $(BUILD_ROOT)
 
 cldl: .symbolic
-	@cd $(DOSLIB:$(to_os_path))
+	@cd $(DOSLIBDIR:$(to_os_path))
 	@$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE) clean
 	@cd $(BUILD_ROOT)
 
@@ -475,12 +499,12 @@ mx_: .symbolic
 	@wmake -h -f makefile all
 	@cd $(BUILD_ROOT)
 
+!ifdef __LINUX__
 vrs: .symbolic
+$(SPRIUTILEXEC):
 	@cd $(DOSLIB_VGA:$(to_os_path))
 	#@make clean
 	@make all
-	@mv pcx2vrl $(BUILD_ROOT)$(DIRSEP)
-	@mv pcxsscut $(BUILD_ROOT)$(DIRSEP)
-	@mv vrl2vrs $(BUILD_ROOT)$(DIRSEP)
-	@mv vrsdump $(BUILD_ROOT)$(DIRSEP)
+	@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#$(DIRSEP)
 	@cd $(BUILD_ROOT)
+!endif