X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=makefile;h=e6f0d7d624ed60f097052a50c6f7331df3b19d8a;hb=f791077eab2bcb7993d267fdaeba388fd078b60a;hp=cad8a5545fad06003d70d52d7dc96564d9dcfe41;hpb=b79af85b8e5b6ff94341b85ea2de8a5dfb9080f5;p=16.git

diff --git a/makefile b/makefile
index cad8a554..e6f0d7d6 100755
--- a/makefile
+++ b/makefile
@@ -177,6 +177,7 @@ EXTERNTESTEXEC = &
 	wcpu.exe &
 	db.exe
 TESTEXEC = &
+	test.exe &
 	tesuto.exe &
 	0.exe &
 	exmmtest.exe &
@@ -184,21 +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 &
 	$(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
@@ -487,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