TARGET_OS = dos
#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
+PDIR=..$(DIRSEP)
SRC=src$(DIRSEP)
SRCLIB=$(SRC)lib$(DIRSEP)
JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
MODEXLIB_=$(SRCLIB)modex$(DIRSEP)
VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
DOSLIB=$(SRCLIB)doslib$(DIRSEP)
+DOSLIBDIR=$(SRCLIB)doslib
WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
WLIBQ=-q
WCLQ=-zq $(WLIBQ)
-UPXQ=
+UPXQ=-qqq
AFLAGS=-mh -0 -d1
16FLAGS=-fh=16.hed
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)
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) timer.$(OBJ)
-#
-#3812intf.$(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)
+DOSLIBLIBS=dl_vga.lib dl_cpu.lib dl_dos.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
-all: $(EXEC)
+!include $(DOSLIBDIR)/extdep.mak
+
+all: $(EXEC) datatest
+
+cute.vrl: data/cute.pcx $(PCX2VRL)
+ $(PCX2VRL) -i data/cute.pcx -o cute.vrl -p cute.pal -tc 254
+ # you can then test this against TESUTO.EXE by typing: TESUTO CUTE.VRL CUTE.PAL
+
+datatest: cute.vrl .symbolic
-#$(16LIBOBJS) => 16.lib
+# doslib PCX to VRL converter native host binary
+$(PCX2VRL): $(DOSLIBDIR)/hw/vga/pcx2vrl.c
+ cd $(DOSLIBDIR)/hw/vga && make pcx2vrl
+
+#$(16LIBOBJS) => 16.lib bug....
#
#game and bakapi executables
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)
+# %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)
tesuto.$(OBJ): $(SRC)tesuto.c
- wcl $(WCLQ) -mh -d2 -c $(SRC)tesuto.c
+ wcl $(FLAGS) $(DOSLIB_CINCLUDE) $(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)
pcxtest.exe: pcxtest.$(OBJ) gfx.lib
wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map
-palettec.exe: palettec.$(OBJ) $(16LIBOBJS) gfx.lib
- wcl $(FLAGS) palettec.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettec.map
+palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS)
+ wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.map #$(16LIBOBJS)
-palettel.exe: palettel.$(OBJ) $(16LIBOBJS) gfx.lib
- wcl $(FLAGS) palettel.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettel.map
+palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS)
+ wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.map #$(16LIBOBJS)
pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map
vgmsnd.lib: $(VGMSNDOBJ)
wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
+
+# library deps 16-bit huge
+dl_vga.lib:
+ cd $(DOSLIBDIR)/hw/vga && ./make.sh
+ cp $(DOSLIBDIR)/hw/vga/dos86h/vga.lib dl_vga.lib
+
+dl_cpu.lib:
+ cd $(DOSLIBDIR)/hw/cpu && ./make.sh
+ cp $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib dl_cpu.lib
+
+dl_dos.lib:
+ cd $(DOSLIBDIR)/hw/dos && ./make.sh
+ cp $(DOSLIBDIR)/hw/dos/dos86h/dos.lib dl_dos.lib
+
modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
wcl $(FLAGS) -c $(SRCLIB)modex16.c
mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
wcl $(FLAGS) -c $(SRCLIB)mapread.c
-timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
- wcl $(FLAGS) -c $(SRCLIB)timer.c
+16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c
+ wcl $(FLAGS) -c $(SRCLIB)16_timer.c
16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
wcl $(FLAGS) -c $(SRCLIB)16_in.c
@$(REMOVECOMMAND) *.$(OBJ)
@$(REMOVECOMMAND) 16.lib
@$(REMOVECOMMAND) gfx.lib
- @$(REMOVECOMMAND) doslib.lib
@$(REMOVECOMMAND) vgmsnd.lib
+ @$(REMOVECOMMAND) $(DOSLIBLIBS)
@wlib -n $(WLIBQ) 16.lib
@wlib -n $(WLIBQ) gfx.lib
- @wlib -n $(WLIBQ) doslib.lib
@wlib -n $(WLIBQ) vgmsnd.lib
+ @wlib -n $(WLIBQ) dl_cpu.lib
+ @wlib -n $(WLIBQ) dl_dos.lib
+ @wlib -n $(WLIBQ) dl_vga.lib
@$(REMOVECOMMAND) *.16
@$(REMOVECOMMAND) *.16W
@$(REMOVECOMMAND) *.16B
# @echo $(INCLUDE)
comp: .symbolic
+ @upx -9 $(EXEC)
+
+comq: .symbolic
@upx -9 $(UPXQ) $(EXEC)
-## @upx -9 $(UPXQ) x-demo.exe
+
+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/
+
+getwww: .symbolic
+ @x4get.bat $(EXEC)
#git submodule add <repo>
uplibs: .symbolic
updatelibs: .symbolic
@cd $(JSMNLIB)
@git pull
- @cd ../../../
+ @cd $(PDIR)$(PDIR)$(PDIR)
@cd $(DOSLIB)
@git pull
@./buildall.sh
- @cd ../../../
+ @cd $(PDIR)$(PDIR)$(PDIR)
+
+reinitlibs: .symbolic
+ @rm -rf $(SRCLIB)doslib
+ @rm -rf $(SRCLIB)jsmn
+ @mkdir $(SRCLIB)doslib
+ @mkdir $(SRCLIB)jsmn
+ @wmake -h initlibs
initlibs: .symbolic
- @cd src/lib
+ @cd $(SRCLIB)
@git clone https://github.com/joncampbell123/doslib.git
@git clone https://github.com/zserge/jsmn.git
- @cd ../../
+ @cd $(PDIR)$(PDIR)
+##
+## experimental libs
+##
xlib: .symbolic
@cd 16/xlib
@wmake -h clean
@wmake -h all
- @cd ../../
+ @cd $(PDIR)$(PDIR)
mx: .symbolic
@cd 16/xw
# @wmake clean
@wmake -h all
- @cd ../../
+ @cd $(PDIR)$(PDIR)
mx_: .symbolic
@cd 16/xw_
@wmake -h -f makefile all
- @cd ../../
-
-www: .symbolic
- @rm -f /var/www/$(EXEC)
- @cp -f $(EXEC) /var/www/
- @bash ./z.sh $(EXEC) $(EXEC)
- @cp -f *.exe.zip.* /var/www/
- @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/
- @scp -r -P 26 *.exe.zip.* 4ch.mooo.com:/var/www/16/
-
+ @cd $(PDIR)$(PDIR)
projects / 16.git / blobdiff