X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=d8b5fd20b827b65f5ca462e2695741d1b8f2c12f;hb=a0c8c6d71df93144759c619f90fe3e14f010b65e;hp=9ce52ddf54796e289442c91491e310498b4ac58e;hpb=a5bfd214c0f6935d7a5c2753fd032dd6ab69e997;p=16.git

diff --git a/makefile b/makefile
index 9ce52ddf..d8b5fd20 100755
--- a/makefile
+++ b/makefile
@@ -46,6 +46,8 @@ TARGET_OS = dos
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 PDIR=..$(DIRSEP)
 SRC=src$(DIRSEP)
+DATADIR=data$(DIRSEP)
+SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 NYANLIB=$(SRCLIB)nyan$(DIRSEP)
@@ -64,7 +66,7 @@ UPXQ=-qqq
 AFLAGS=-mh -0 -d1
 16FLAGS=-fh=16.hed
 BAKAPIFLAGS=-fh=bakapi.hed
-SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768
+SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#55808#60000
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm
 CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww
@@ -72,12 +74,12 @@ OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 
-DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
+#DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
 
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS)
 
 DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib
 
@@ -86,7 +88,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)
+all: $(EXEC) joytest.exe vrs
 
 #$(16LIBOBJS) => 16.lib bug....
 #
@@ -95,8 +97,9 @@ all: $(EXEC)
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
 	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map
 
-bakapi.exe: bakapi.$(OBJ) gfx.lib modex.lib
-	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib modex.lib -fm=bakapi.map
+bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
+	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.map
+#modex.lib
 #
 #Test Executables!
 #
@@ -116,16 +119,6 @@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
 tesuto.$(OBJ): $(SRC)tesuto.c
 	wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
 
-#tesuto.exe: tesuto.$(OBJ)
-#	wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
-#tesuto.$(OBJ): $(SRC)tesuto.c
-#	wcl $(WCLQ) -mh -d2 -c $(SRC)tesuto.c
-
-#sega.exe: sega.$(OBJ)
-#	wcl $(FLAGS) sega.$(OBJ)
-#sega.$(OBJ): $(SRC)sega.c
-#	wcl $(FLAGS) -c $(SRC)sega.c
-
 test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ)
 	wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) -fm=test.map
 
@@ -301,6 +294,8 @@ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib:
 	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos && .$(DIRSEP)make.sh
 $(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
 #$(DOSLIBLIBS): .symbolic
 #	@cd $(DOSLIB)
 #	@.$(DIRSEP)buildall.sh
@@ -416,6 +411,7 @@ modex.$(OBJ): $(MODEXLIB_)modex.asm
 #
 clean: .symbolic
 	@$(REMOVECOMMAND) $(EXEC)
+	@$(REMOVECOMMAND) /var/www/$(EXEC)*
 	@$(REMOVECOMMAND) *.$(OBJ)
 	@$(REMOVECOMMAND) 16.lib
 	@$(REMOVECOMMAND) gfx.lib
@@ -438,8 +434,9 @@ clean: .symbolic
 	@$(REMOVECOMMAND) *.MAP
 	@$(REMOVECOMMAND) *.map
 	@$(REMOVECOMMAND) *.err
-	@$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
-	@$(COPYCOMMAND) .gitmodules git_modu.les
+	#@cd $(DOSLIB)
+	#@./buildall.sh clean
+	#@cd $(PDIR)$(PDIR)$(PDIR)
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -450,6 +447,10 @@ clean: .symbolic
 #	@echo $(watcom)
 #	@echo $(INCLUDE)
 
+backupconfig: .symbolic
+	@$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
+	@$(COPYCOMMAND) .gitmodules git_modu.les
+
 comp: .symbolic
 	@upx -9 $(EXEC)
 
@@ -517,3 +518,13 @@ mx_: .symbolic
 	@cd 16$(DIRSEP)xw_
 	@wmake -h -f makefile all
 	@cd $(PDIR)$(PDIR)
+
+vrs: .symbolic
+	@cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga
+	#@make clean
+	@make all
+	@mv pcx2vrl ../../../../../
+	@mv pcxsscut ../../../../../
+	@mv vrl2vrs ../../../../../
+	@mv vrsdump ../../../../../
+	@cd ../../../../../