DIRSEP=\
OBJ=obj
!endif
-!ifndef INCLUDE
-IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h
-IFLAGS=-i=$(IN)
-!endif
+#!ifndef INCLUDE
+#IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h
+#IFLAGS=-i=$(IN)
+#!endif
TARGET_OS = dos
#-zk0u = translate kanji to unicode... wwww
FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
-VGMSNDOBJ = 16_snd.$(OBJ) vgmSnd.$(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) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ)
-#scroll16.$(OBJ)
-#timer.$(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)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ)
-TESTEXEC = exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe inputest.exe scroll.exe vgmtest.exe
-#tsthimem.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) compress
+all: $(EXEC)
#
#game and bakapi executables
#
-16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
- wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=16.map
+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) 16.lib
- wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) 16.lib -fm=bakapi.map
+bakapi.exe: bakapi.$(OBJ) $(16LIBOBJS) gfx.lib
+ wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib -fm=bakapi.map
#
#Test Executables!
#
-scroll.exe: scroll.$(OBJ) scroll16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ) 16_in.$(OBJ) wcpu.$(OBJ)
- wcl $(FLAGS) scroll.$(OBJ) scroll16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=scroll.map#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ) 16_in.$(OBJ) wcpu.$(OBJ)
+scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
+ wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=scroll.map
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
test2.exe: test2.$(OBJ) gfx.lib
wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map
-fonttest.exe: fonttest.$(OBJ) 16.lib
- wcl $(FLAGS) fonttest.$(OBJ) 16.lib# -fm=fonttest.map
+fonttest.exe: fonttest.$(OBJ) $(16LIBOBJS) gfx.lib
+ wcl $(FLAGS) fonttest.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fonttest.map
-#fonttes0.exe: fonttes0.$(OBJ) 16.lib
-# wcl $(FLAGS) fonttes0.$(OBJ) 16.lib
+#fonttes0.exe: fonttes0.$(OBJ) $(16LIBOBJS)
+# wcl $(FLAGS) fonttes0.$(OBJ) $(16LIBOBJS)
-fontgfx.exe: fontgfx.$(OBJ) 16.lib
- wcl $(FLAGS) fontgfx.$(OBJ) 16.lib -fm=fontgfx.map
+fontgfx.exe: fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib
+ wcl $(FLAGS) fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fontgfx.map
-inputest.exe: inputest.$(OBJ) 16.lib
- wcl $(FLAGS) -D__DEBUG_InputMgr__=1 inputest.$(OBJ) 16.lib -fm=inputest.map
+inputest.exe: inputest.$(OBJ) $(16LIBOBJS)
+ wcl $(FLAGS) -D__DEBUG_InputMgr__=1 inputest.$(OBJ) $(16LIBOBJS) -fm=inputest.map
-#sountest.exe: sountest.$(OBJ) 16.lib
-# wcl $(FLAGS) sountest.$(OBJ) 16.lib
+#sountest.exe: sountest.$(OBJ) $(16LIBOBJS)
+# wcl $(FLAGS) sountest.$(OBJ) $(16LIBOBJS)
-#miditest.exe: miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
-# wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
+#miditest.exe: miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ)
+# wcl $(FLAGS) miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ)
-tsthimem.exe: tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
- wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) -fm=tsthimem.map
+tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
+ wcl $(FLAGS) tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -fm=tsthimem.map
-#testemm.exe: testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
-# wcl $(FLAGS) testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#testemm.exe: testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
+# wcl $(FLAGS) testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
-#testemm0.exe: testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
-# wcl $(FLAGS) testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#testemm0.exe: testemm0.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
+# wcl $(FLAGS) testemm0.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
pcxtest.exe: pcxtest.$(OBJ) gfx.lib
wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map
-palettec.exe: palettec.$(OBJ) 16.lib
- wcl $(FLAGS) palettec.$(OBJ) 16.lib -fm=palettec.map
+palettec.exe: palettec.$(OBJ) $(16LIBOBJS) gfx.lib
+ wcl $(FLAGS) palettec.$(OBJ) $(16LIBOBJS) gfx.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
+maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
+ wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=maptest.map
-#maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
-# wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
+#maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)
+# wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)
#emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)
# wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)
#emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
# wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
-fmemtest.exe: fmemtest.$(OBJ) 16.lib
- wcl $(FLAGS) fmemtest.$(OBJ) 16.lib -fm=fmemtest.map
+fmemtest.exe: fmemtest.$(OBJ) $(16LIBOBJS)
+ wcl $(FLAGS) fmemtest.$(OBJ) $(16LIBOBJS) -fm=fmemtest.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)
+exmmtest.exe: exmmtest.$(OBJ) $(16LIBOBJS)
+ wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.map $(16LIBOBJS)
-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 $(16LIBOBJS)
+ wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map $(16LIBOBJS)
#====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map
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
#
#non executable objects libraries
#
-16.lib: $(16LIBOBJS) gfx.lib# doslib.lib vgmsnd.lib
- wlib -b -q 16.lib $(16LIBOBJS) gfx.lib# doslib.lib vgmsnd.lib
+16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib
+ wlib -b -q $(16LIBOBJS) $(16LIBOBJS)# doslib.lib vgmsnd.lib
gfx.lib: $(GFXLIBOBJS)
wlib -b -q gfx.lib $(GFXLIBOBJS)
mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
wcl $(FLAGS) -c $(SRCLIB)mapread.c
-#fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
-# wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
-
timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
wcl $(FLAGS) -c $(SRCLIB)timer.c
# @$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
# @$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
# @$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
- @echo $(watcom)
- @echo $(INCLUDE)
+# @echo $(watcom)
+# @echo $(INCLUDE)
+
+comp: .symbolic
+ upx -9 $(EXEC)
-compress: .symbolic
- upx $(EXEC)
+updatelibs: .symbolic
+ cd $(JSMNLIB)
+ git pull
+ cd ../../../
projects / 16.git / blobdiff