X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=cf5e2cbe148ce3c40f0bf14a42ba4ee8d37d5dfe;hb=8ae6c7e022c26bad44a6488b8a589ddbe7c8731b;hp=46fa416870f8ac3eb37d43cae35acf9460905339;hpb=b944e5a4e57c1a1ba44dff4ffafdee4edd5b5d99;p=16.git

diff --git a/makefile b/makefile
index 46fa4168..cf5e2cbe 100755
--- a/makefile
+++ b/makefile
@@ -58,6 +58,7 @@ MODEXLIB=$(SRCLIB)modex16$(DIRSEP)
 MODEXLIB_=$(SRCLIB)modex$(DIRSEP)
 VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
 DOSLIB=$(SRCLIB)doslib$(DIRSEP)
+DOSLIBDIR=$(SRCLIB)doslib
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 WLIBQ=-q
@@ -70,10 +71,11 @@ BAKAPIFLAGS=-fh=bakapi.hed
 SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm
-CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##wwww
+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)
@@ -82,15 +84,16 @@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ)
 
+DOSLIBLIBS=$(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib $(DOSLIBDIR)/hw/dos/dos86h/dos.lib $(DOSLIBDIR)/hw/vga/dos86h/vga.lib
+
 TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
 # tsthimem.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
-EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
+EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe drawvrl5.exe
 
 all: $(EXEC)
 
 #$(16LIBOBJS) => 16.lib bug....
-
 #
 #game and bakapi executables
 #
@@ -107,10 +110,25 @@ scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
 scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
 
-tesuto.exe: tesuto.$(OBJ)
-	wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
+
+# NOTE: dos86h = 16-bit huge memory model. memory model must match!
+tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
+#	%write tmp.cmd option quiet option map=tesuto.map $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe
+#	%write tmp.cmd library $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib
+#	%write tmp.cmd library $(DOSLIBDIR)/hw/dos/dos86h/dos.lib
+#	@wlink @tmp.cmd
+	wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
 tesuto.$(OBJ): $(SRC)tesuto.c
-	wcl $(WCLQ) -mh -d2 -c $(SRC)tesuto.c
+	wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
+
+drawvrl5.exe: .symbolic
+	#@cd $(DOSLIB)hw/vga/make.
+	@wmake $(DOSLIBDIR)/hw/vga/dos86h/vga.lib
+	@$(COPYCOMMAND) $(DOSLIBDIR)/hw/vga/dos86h/drawvrl5.exe ./
+#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)
@@ -276,12 +294,27 @@ vgmtest.$(OBJ): $(SRC)vgmtest.c
 gfx.lib: $(GFXLIBOBJS)
 	wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS)
 
-doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
-	wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+#doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+#	wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
 
 vgmsnd.lib: $(VGMSNDOBJ)
 	wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
 
+# extdep:
+# !include $(DOSLIBDIR)/extdep.mak
+
+# library deps 16-bit huge
+$(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib:
+	cd $(DOSLIBDIR)/hw/cpu && ./make.sh
+$(DOSLIBDIR)/hw/dos/dos86h/dos.lib:
+	cd $(DOSLIBDIR)/hw/dos && ./make.sh
+$(DOSLIBDIR)/hw/vga/dos86h/vga.lib:
+	cd $(DOSLIBDIR)/hw/vga && ./make.sh
+#$(DOSLIBLIBS): .symbolic
+#	@cd $(DOSLIB)
+#	@./buildall.sh
+#	@cd $(PDIR)$(PDIR)$(PDIR)
+
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
@@ -395,11 +428,9 @@ clean: .symbolic
 	@$(REMOVECOMMAND) *.$(OBJ)
 	@$(REMOVECOMMAND) 16.lib
 	@$(REMOVECOMMAND) gfx.lib
-	@$(REMOVECOMMAND) doslib.lib
 	@$(REMOVECOMMAND) vgmsnd.lib
 	@wlib -n $(WLIBQ) 16.lib
 	@wlib -n $(WLIBQ) gfx.lib
-	@wlib -n $(WLIBQ) doslib.lib
 	@wlib -n $(WLIBQ) vgmsnd.lib
 	@$(REMOVECOMMAND) *.16
 	@$(REMOVECOMMAND) *.16W
@@ -417,6 +448,7 @@ clean: .symbolic
 	@$(REMOVECOMMAND) *.map
 	@$(REMOVECOMMAND) *.err
 	@$(COPYCOMMAND) .git/config git_con.fig
+	@$(COPYCOMMAND) .gitmodules git_modu.les
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -431,36 +463,45 @@ comp: .symbolic
 	@upx -9 $(EXEC)
 
 comq: .symbolic
-        @upx -9 $(UPXQ) $(EXEC)
+	@upx -9 $(UPXQ) $(EXEC)
 
 www: .symbolic
-#       @rm /var/www/$(EXEC)
-        @cp ./$(EXEC) /var/www/
-        @./z.sh $(EXEC) $(EXEC)
-        @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/
-        @scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/
+	@ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe.zip*'
+	@rm "/var/www/$(EXEC).zip*"
+	#@cp ./$(EXEC) /var/www/
+	@./z.sh $(EXEC) $(EXEC)
+	@scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/
+	@scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/
+
+getwww: .symbolic
+	@x4get.bat $(EXEC)
 
+##
+##	External library management~ ^^
+##
 #git submodule add <repo>
-uplibs: .symbolic
-	@wmake -h updatelibs
+mkdl: .symbolic
+	@cd $(DOSLIB)
+	@./buildall.sh
+	@cd $(PDIR)$(PDIR)$(PDIR)
 
-updatelibs: .symbolic
+uplibs: .symbolic
 	@cd $(JSMNLIB)
 	@git pull
 	@cd $(PDIR)$(PDIR)$(PDIR)
 	@cd $(DOSLIB)
 	@git pull
-	@./buildall.sh
 	@cd $(PDIR)$(PDIR)$(PDIR)
 
 reinitlibs: .symbolic
 	@rm -rf $(SRCLIB)doslib
 	@rm -rf $(SRCLIB)jsmn
-	@mkdir $(SRCLIB)doslib
-	@mkdir $(SRCLIB)jsmn
+	#@mkdir $(SRCLIB)doslib
+	#@mkdir $(SRCLIB)jsmn
 	@wmake -h initlibs
 
 initlibs: .symbolic
+	@cp git_modu.les .gitmodules
 	@cd $(SRCLIB)
 	@git clone https://github.com/joncampbell123/doslib.git
 	@git clone https://github.com/zserge/jsmn.git