X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=c0546833bb25e518570cbbc99d080cd95eb58c01;hb=68da8c690a720b595598a0dcee0c2f6b33aa1287;hp=da72eac0ea77eafe29a6e54f06f13ccc3f378a43;hpb=32e0bfea8d60e4f1b03c99a43fabcde3747613b8;p=16.git

diff --git a/makefile b/makefile
index da72eac0..c0546833 100755
--- a/makefile
+++ b/makefile
@@ -125,7 +125,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_enti.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -185,6 +185,7 @@ TESTEXEC = &
 	scroll.exe &
 	zcroll.exe &
 	inputest.exe &
+	pcxtest.exe &
 	vrstest.exe
 TESTEXEC2 = &
 	maptest.exe &
@@ -192,13 +193,22 @@ TESTEXEC2 = &
 	fonttest.exe &
 	fontgfx.exe &
 	test0.exe &
-	pcxtest.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 &
@@ -236,8 +246,9 @@ 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) $(16LIB)
@@ -260,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
@@ -318,13 +330,15 @@ bitmap.$(OBJ):	$(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h
 planar.$(OBJ):	$(SRCLIB)/planar.c $(SRCLIB)/planar.h
 scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
 16text.$(OBJ):	$(SRCLIB)/16text.c $(SRCLIB)/16text.h
+16_enti.$(OBJ):	$(SRCLIB)/16_enti.c $(SRCLIB)/16_enti.h
 mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
 16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h
 16_in.$(OBJ):	 $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h
-16_mm.$(OBJ):	 $(SRCLIB)/16_mm.c $(SRCLIB)/16_mm.h
-16_pm.$(OBJ):	 $(SRCLIB)/16_pm.c $(SRCLIB)/16_pm.h
-16_ca.$(OBJ):	 $(SRCLIB)/16_ca.c $(SRCLIB)/16_ca.h
+16_rf.$(OBJ):	 $(SRCLIB)/16_rf.c	$(SRCLIB)/16_rf.h
+16_mm.$(OBJ):	 $(SRCLIB)/16_mm.c	$(SRCLIB)/16_mm.h
+16_pm.$(OBJ):	 $(SRCLIB)/16_pm.c	$(SRCLIB)/16_pm.h
+16_ca.$(OBJ):	 $(SRCLIB)/16_ca.c	$(SRCLIB)/16_ca.h
 16_dbg.$(OBJ):	$(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
 midi.$(OBJ):	$(SRCLIB)/midi.c $(SRCLIB)/midi.h
 16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h
@@ -365,6 +379,7 @@ clean: .symbolic
 	@if exist *.mah $(REMOVECOMMAND) *.mah
 	@if exist *.MAH $(REMOVECOMMAND) *.MAH
 	@if exist *.err $(REMOVECOMMAND) *.err
+	@if exist TC*.SWP $(REMOVECOMMAND) TC*.SWP
 #	@if exist *.16W $(REMOVECOMMAND) *.16W
 #	@if exist *.16B $(REMOVECOMMAND) *.16B
 
@@ -406,10 +421,12 @@ wwwext: .symbolic
 	@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/
+	@scp -r -P $(HOSTPORT) $(DATADIR)spri.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/
+	@scp -r -P $(HOST2PORT) $(DATADIR)spri.zip $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
 
 getwww: .symbolic
 	*x4get.bat $(EXEC)
@@ -487,12 +504,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