Merge remote-tracking branch 'upstream/master'

[16.git] / makefile

diff --git a/makefile b/makefile
index 680e706824562ce6a83631b967096e6154addaf4..d29eb7c4cffad77c5c85d086ca5be7d9d96cd5ec 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -73,6 +73,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,8 +89,7 @@ TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
 
-all: $(EXEC) vrl2vrs.exe pcxsscut.exe
-#joytest.exe
+all: $(EXEC) joytest.exe vrs
 
 #$(16LIBOBJS) => 16.lib bug....
 #
@@ -297,10 +297,6 @@ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib:
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
 joytest.exe:
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)joytest.exe
-pcxsscut.exe:
-       cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86l$(DIRSEP)pcxsscut.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)
-vrl2vrs.exe:
-       cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86l$(DIRSEP)vrl2vrs.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)
 #$(DOSLIBLIBS): .symbolic
 #      @cd $(DOSLIB)
 #      @.$(DIRSEP)buildall.sh
@@ -524,6 +520,12 @@ mx_: .symbolic
        @wmake -h -f makefile all
        @cd $(PDIR)$(PDIR)
 
-ed: .symbolic
-@cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
-@call spri.bat
+vrs: .symbolic
+       @cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga
+       #@make clean
+       @make all
+       @mv pcx2vrl ../../../../../
+       @mv pcxsscut ../../../../../
+       @mv vrl2vrs ../../../../../
+       @mv vrsdump ../../../../../
+       @cd ../../../../../