DIRSEP=\
OBJ=obj
!endif
+#!ifndef INCLUDE
+#IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h
+#IFLAGS=-i=$(IN)
+#!endif
+
TARGET_OS = dos
#-zk0u = translate kanji to unicode... wwww
#-zk0 = kanji support~
16FLAGS=-fh=16.hed
BAKAPIFLAGS=-fh=bakapi.hed
-SFLAGS=-sg -st -of+ -k32768 -zu -zdf -zff -zgf#49152#24576
+SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k56000#60000#32768
DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
ZFLAGS=-zk0 -zq -zc -zp8# -zm
-CFLAGS=-mc -lr -l=dos -wo -x# -d2##wwww
+CFLAGS=$(IFLAGS) -mh -lr -l=dos -wo# -d2##wwww
OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87 -onac -ol+ -ok####x
FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
+VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
-16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) vgmSnd.$(OBJ)
+16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) scroll16.$(OBJ)
+#timer.$(OBJ)
+#3812intf.$(OBJ)
GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
-TESTEXEC = exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe tsthimem.exe inputest.exe scroll.exe
-#++++vgmtest.exe
+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
+# tsthimem.exe
+#inputest.exe
#testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
-EXEC = 16.exe bakapi.exe $(TESTEXEC)
+EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
all: $(EXEC)
#
#Test Executables!
#
-scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
- wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) -fm=scroll.map
+scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ) 16_in.$(OBJ) wcpu.$(OBJ)
+ wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=scroll.map#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ) 16_in.$(OBJ) wcpu.$(OBJ)
scroll.$(OBJ): $(SRC)scroll.c
wcl $(FLAGS) -c $(SRC)scroll.c
+tesuto.exe: tesuto.$(OBJ)
+ wcl -mh -d2 tesuto.$(OBJ)
+tesuto.$(OBJ): $(SRC)tesuto.c
+ wcl -mh -d2 -c $(SRC)tesuto.c
+
#sega.exe: sega.$(OBJ)
# wcl $(FLAGS) sega.$(OBJ)
#sega.$(OBJ): $(SRC)sega.c
palettec.exe: palettec.$(OBJ) 16.lib
wcl $(FLAGS) palettec.$(OBJ) 16.lib -fm=palettec.map
+pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
+ wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map
+
maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=maptest.map
fmemtest.exe: fmemtest.$(OBJ) 16.lib
wcl $(FLAGS) fmemtest.$(OBJ) 16.lib -fm=fmemtest.map
-exmmtest.exe: exmmtest.$(OBJ) 16.lib
- wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map
+exmmtest.exe: exmmtest.$(OBJ) 16.lib#16_head.$(OBJ) 16_mm.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
+ wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map#16_head.$(OBJ) 16_mm.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
+
+# vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib 16_in.$(OBJ) 16_head.$(OBJ)
+# wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map 16_in.$(OBJ) 16_head.$(OBJ)
+vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib 16.lib
+ wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map 16.lib
+ #====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map
-vgmtest.exe: vgmtest.$(OBJ) 16.lib
- wcl $(FLAGS) vgmtest.$(OBJ) 16.lib -fm=vgmtest.map
#
#executable's objects
pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
wcl $(FLAGS) -c $(SRC)pcxtest.c
+pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h
+ wcl $(FLAGS) -c $(SRC)pcxtest2.c
+
palettec.$(OBJ): $(SRC)palettec.c
wcl $(FLAGS) -c $(SRC)palettec.c
vgmtest.$(OBJ): $(SRC)vgmtest.c
wcl $(FLAGS) -c $(SRC)vgmtest.c
+ #====wcl -mc -c $(SRC)vgmtest.c
#
#non executable objects libraries
#
-16.lib: $(16LIBOBJS) gfx.lib doslib.lib
- wlib -b 16.lib $(16LIBOBJS) gfx.lib doslib.lib
+16.lib: $(16LIBOBJS) gfx.lib# doslib.lib vgmsnd.lib
+ wlib -b -q 16.lib $(16LIBOBJS) gfx.lib# doslib.lib vgmsnd.lib
gfx.lib: $(GFXLIBOBJS)
- wlib -b gfx.lib $(GFXLIBOBJS)
+ wlib -b -q gfx.lib $(GFXLIBOBJS)
doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
- wlib -b doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+ wlib -b -q doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+
+vgmsnd.lib: $(VGMSNDOBJ)
+ wlib -b -q vgmsnd.lib $(VGMSNDOBJ)
modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
wcl $(FLAGS) -c $(SRCLIB)modex16.c
16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
wcl $(FLAGS) -c $(SRCLIB)16_hc.c
+16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c
+ wcl $(FLAGS) -c $(SRCLIB)16_snd.c
+ #====wcl -mc -c $(SRCLIB)16_snd.c
+
jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
+ #====wcl -c -mc $(VGMSNDLIB)vgmSnd.c
+
+#3812intf.$(OBJ): $(VGMSNDLIB)3812intf.h $(VGMSNDLIB)3812intf.c
+# wcl $(FLAGS) -c $(VGMSNDLIB)3812intf.c
#farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
# wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
@wlib -n 16.lib
@wlib -n gfx.lib
@wlib -n doslib.lib
+ @wlib -n vgmsnd.lib
@$(REMOVECOMMAND) *.16
@$(REMOVECOMMAND) *.16W
@$(REMOVECOMMAND) *.16B
@$(REMOVECOMMAND) *.OBJ
+ @$(REMOVECOMMAND) *.o
@$(REMOVECOMMAND) *.BCO
@$(REMOVECOMMAND) makefi~1
@$(REMOVECOMMAND) makefile~
- @$(REMOVECOMMAND) __WCL__.LNK
+ @$(REMOVECOMMAND) __wcl__.LNK
# @$(REMOVECOMMAND) *.smp
@$(REMOVECOMMAND) *.SMP
@$(REMOVECOMMAND) *.hed
@$(REMOVECOMMAND) *.MAP
@$(REMOVECOMMAND) *.map
+ @$(REMOVECOMMAND) *.err
@$(COPYCOMMAND) .git/config git_con.fig
# @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
# @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
# @$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
# @$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
# @$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
+# @echo $(watcom)
+# @echo $(INCLUDE)
+
+comp: .symbolic
+ upx -9 $(EXEC)
+
+updatelibs: .symbolic
+ cd $(JSMNLIB)
+ git pull
+ cd ../../../