X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=3cd943e25be3b055eed249448eeec399b63255e8;hb=e600b06ae138ce44897e263457fc72668ac3775e;hp=fd200d8507ac80b99a973f5f5d56a444f934f943;hpb=48b52c6681fb990015e663a33b86a64af7abc85f;p=16.git

diff --git a/makefile b/makefile
old mode 100644
new mode 100755
index fd200d85..a43cf7e5
--- a/makefile
+++ b/makefile
@@ -1,144 +1,405 @@
-#-zk0u = translate kanji to unicode... wwww
-#-zk0 = kanji support~
-#-zkl = current codepage
-
-MFLAGS=-mh# -zm
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
-OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 $(OFLAGS) $(CFLAGS)
-REMOVECOMMAND=del
-DIRSEP=\
-SRC=src$(DIRSEP)
-SRCLIB=$(SRC)lib$(DIRSEP)
+#
+#	Higanbana Project makefile
+#
+#
+# Possible optimizations for 8088 class processors
+#
+# -oa   Relax alias checking
+# -ob   Try to generate straight line code
+# -oe - expand user functions inline (-oe=20 is default, adds lots of code)
+# -oh   Enable repeated optimizations
+# -oi   generate certain lib funcs inline
+# -oi+  Set max inline depth (C++ only, use -oi for C)
+# -ok   Flowing of register save into function flow graph
+# -ol   loop optimizations
+# -ol+  loop optimizations plus unrolling
+# -or   Reorder for pipelined (486+ procs); not sure if good to use
+# -os   Favor space over time
+# -ot   Favor time over space
+# -ei   Allocate an "int" for all enum types
+# -zp2  Allow compiler to add padding to structs
+# -zpw  Use with above; make sure you are warning free!
+# -0    8088/8086 class code generation
+# -s    disable stack overflow checking
+
+#%.C
+#192x144
+#wwww will add these
+!ifdef __LINUX__
+REMOVECOMMAND=rm -f
+COPYCOMMAND=cp -f
+DIRSEP=/
+OBJ=o
+!else
+REMOVECOMMAND=del
+COPYCOMMAND=copy /y
+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~
+#-zkl = current codepage
+
+#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
+SRC=src$(DIRSEP)
+SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
-EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+NYANLIB=$(SRCLIB)nyan$(DIRSEP)
+#EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
+DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = modex16.obj dos_kb.obj bitmap.obj planar.obj wcpu.obj lib_head.obj scroll16.obj
-
-all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe 
+16FLAGS=-fh=16.hed
+BAKAPIFLAGS=-fh=bakapi.hed
+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=$(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 = 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) bakapee.$(OBJ) scroll16.$(OBJ)
+
+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
+# tsthimem.exe
+#testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
+EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
+
+all: $(EXEC) comp
 
 #
-#executables
+#game and bakapi executables
 #
-16.exe: 16.obj mapread.obj jsmn.obj 16.lib
-	wcl $(FLAGS) 16.obj mapread.obj jsmn.obj 16.lib
-
-scroll.exe: scroll.obj 16.lib mapread.obj jsmn.obj
-	wcl $(FLAGS) scroll.obj 16.lib mapread.obj jsmn.obj
-scroll.obj: $(SRC)scroll.c
-	wcl $(FLAGS) -c $(SRC)scroll.c
-test.exe: test.obj modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) test.obj modex16.obj bitmap.obj lib_head.obj
-
-test2.exe: test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj
-	wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj
-
-pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj planar.obj lib_head.obj
-	wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj planar.obj lib_head.obj
+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) $(16LIBOBJS) gfx.lib
+	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib -fm=bakapi.map
+#
+#Test Executables!
+#
+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 -zq -mh -d2 tesuto.$(OBJ)
+tesuto.$(OBJ): $(SRC)tesuto.c
+	wcl -zq -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
+	wcl $(FLAGS) test.$(OBJ) gfx.lib -fm=test.map
+
+test2.exe: test2.$(OBJ) gfx.lib
+	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map
+
+fonttest.exe: fonttest.$(OBJ) $(16LIBOBJS) gfx.lib
+	wcl $(FLAGS) fonttest.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fonttest.map
+
+#fonttes0.exe: fonttes0.$(OBJ) $(16LIBOBJS)
+#	wcl $(FLAGS) fonttes0.$(OBJ) $(16LIBOBJS)
+
+fontgfx.exe: fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib
+	wcl $(FLAGS) fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fontgfx.map
+
+inputest.exe: inputest.$(OBJ) $(16LIBOBJS)
+	wcl $(FLAGS) inputest.$(OBJ) $(16LIBOBJS) -fm=inputest.map
 
-palettec.exe: palettec.obj modex16.obj
-	wcl $(FLAGS) palettec.obj modex16.obj
-
-maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj
+#sountest.exe: sountest.$(OBJ) $(16LIBOBJS)
+#	wcl $(FLAGS) sountest.$(OBJ) $(16LIBOBJS)
 
-maptest0.exe: maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) $(MFLAGS) maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj
+#miditest.exe: miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ)
+#	wcl $(FLAGS) miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ)
 
-emmtest.exe: emmtest.obj memory.obj
-	wcl $(FLAGS) $(MFLAGS) emmtest.obj memory.obj
+tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
+	wcl $(FLAGS) tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -fm=tsthimem.map
 
-emsdump.exe: emsdump.obj memory.obj
-	wcl $(FLAGS) $(MFLAGS) emsdump.obj memory.obj
+#testemm.exe: testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
+#	wcl $(FLAGS) testemm.$(OBJ) $(16LIBOBJS) $(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) $(16LIBOBJS) gfx.lib
+	wcl $(FLAGS) palettec.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettec.map
+
+palettel.exe: palettel.$(OBJ) $(16LIBOBJS) gfx.lib
+	wcl $(FLAGS) palettel.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettel.map
+
+pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
+	wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.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)
+#	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) $(16LIBOBJS)
+	wcl $(FLAGS) fmemtest.$(OBJ) $(16LIBOBJS) -fm=fmemtest.map
+
+exmmtest.exe: exmmtest.$(OBJ) $(16LIBOBJS)
+	wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.map $(16LIBOBJS)
+
+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
 
-fmemtest.exe: fmemtest.obj# memory.obj
-	wcl $(FLAGS) $(MFLAGS) fmemtest.obj# memory.obj
 
 #
 #executable's objects
 #
-16.obj: $(SRC)16.h $(SRC)16.c
+16.$(OBJ): $(SRC)16.h $(SRC)16.c
 	wcl $(FLAGS) -c $(SRC)16.c
-
-test.obj: $(SRC)test.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)test.c
-
-test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)test2.c
-
-pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
+
+bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c
+	wcl $(FLAGS) -c $(SRC)bakapi.c
+
+test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)test.c
+
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)test2.c
+
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.c
 
-palettec.obj: $(SRC)palettec.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
-
-maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h
+
+palettel.$(OBJ): $(SRC)palettel.c
+	wcl $(FLAGS) -c $(SRC)palettel.c
+
+maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)maptest.c
 
-maptest0.obj: $(SRC)maptest0.c# $(SRCLIB)modex16.h
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
+#maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
+
+#emmtest.$(OBJ): $(SRC)emmtest.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
+
+#emsdump.$(OBJ): $(SRC)emsdump.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
 
-emmtest.obj: $(SRC)emmtest.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
+fmemtest.$(OBJ): $(SRC)fmemtest.c
+	wcl $(FLAGS) -c $(SRC)fmemtest.c
 
-emsdump.obj: $(SRC)emsdump.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
+fonttest.$(OBJ): $(SRC)fonttest.c
+	wcl $(FLAGS) -c $(SRC)fonttest.c
 
-fmemtest.obj: $(SRC)fmemtest.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+#fonttes0.$(OBJ): $(SRC)fonttes0.c
+#	wcl $(FLAGS) -c $(SRC)fonttes0.c
+
+fontgfx.$(OBJ): $(SRC)fontgfx.c
+	wcl $(FLAGS) -c $(SRC)fontgfx.c
+
+inputest.$(OBJ): $(SRC)inputest.c
+	wcl $(FLAGS) -c $(SRC)inputest.c
+
+#sountest.$(OBJ): $(SRC)sountest.c
+#	wcl $(FLAGS) -c $(SRC)sountest.c
+
+#miditest.$(OBJ): $(SRC)miditest.c
+#	wcl $(FLAGS) -c $(SRC)miditest.c
+
+#testemm.$(OBJ): $(SRC)testemm.c
+#	wcl $(FLAGS) -c $(SRC)testemm.c
+
+#testemm0.$(OBJ): $(SRC)testemm0.c
+#	wcl $(FLAGS) -c $(SRC)testemm0.c
+
+tsthimem.$(OBJ): $(SRC)tsthimem.c
+	wcl $(FLAGS) -c $(SRC)tsthimem.c
+
+exmmtest.$(OBJ): $(SRC)exmmtest.c
+	wcl $(FLAGS) -c $(SRC)exmmtest.c
+
+vgmtest.$(OBJ): $(SRC)vgmtest.c
+	wcl $(FLAGS) -c $(SRC)vgmtest.c
+	#====wcl -mc -c $(SRC)vgmtest.c
 
 #
 #non executable objects libraries
 #
-16.lib: $(SRCLIB)16.lbr $(16LIBOBJS)
-	wlib -b 16.lib $(16LIBOBJS)
-
-modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
-	wcl $(FLAGS) -c $(SRCLIB)modex16.c
-
-dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
-	wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
-
-bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
-	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
-
-planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c
+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)
+
+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
+
+bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c
+	wcl $(FLAGS) -c $(SRCLIB)bakapee.c
+
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
+	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
+
+planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
 	wcl $(FLAGS) -c $(SRCLIB)planar.c
 
-scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
 	wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 
-wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
-
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
-	wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
-
-fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
-	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
-
-lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
-	wcl $(FLAGS) -c $(SRCLIB)lib_head.c
-
-jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
+
+16text.$(OBJ): $(SRCLIB)16text.c
+	wcl $(FLAGS) -c $(SRCLIB)16text.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_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
+	wcl $(FLAGS) -c $(SRCLIB)16_in.c
+
+16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
+	wcl $(FLAGS) -c $(SRCLIB)16_mm.c
+
+16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
+	wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+
+midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c
+	wcl $(FLAGS) -c $(SRCLIB)midi.c
+
+#
+# doslib stuff
+#
+adlib.$(OBJ): $(DOSLIB)adlib.h $(DOSLIB)adlib.c
+	wcl $(FLAGS) -c $(DOSLIB)adlib.c
+
+8254.$(OBJ): $(DOSLIB)8254.h $(DOSLIB)8254.c
+	wcl $(FLAGS) -c $(DOSLIB)8254.c
+
+8259.$(OBJ): $(DOSLIB)8259.h $(DOSLIB)8259.c
+	wcl $(FLAGS) -c $(DOSLIB)8259.c
+
+dos.$(OBJ): $(DOSLIB)dos.h $(DOSLIB)dos.c
+	wcl $(FLAGS) -c $(DOSLIB)dos.c
+
+cpu.$(OBJ): $(DOSLIB)cpu.h $(DOSLIB)cpu.c
+	wcl $(FLAGS) -c $(DOSLIB)cpu.c
+
+himemsys.$(OBJ): $(DOSLIB)himemsys.h $(DOSLIB)himemsys.c
+	wcl $(FLAGS) -c $(DOSLIB)himemsys.c
+
+emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
+	wcl $(FLAGS) -c $(DOSLIB)emm.c
+
+# end of doslib stuff
+
+16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
+	wcl $(FLAGS) -c $(SRCLIB)16_head.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
 
-farjsmn.obj: $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
-	wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
+kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
+	wcl $(FLAGS) -c $(NYANLIB)kitten.c
+
+vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
+	wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
+	#====wcl -c -mc $(VGMSNDLIB)vgmSnd.c
 
-memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c
-	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.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
+
+#memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
 
 #
 #other~
-#
-clean: .symbolic
-#	@$(REMOVECOMMAND) *.obj
-	@$(REMOVECOMMAND) *.OBJ
-#	@$(REMOVECOMMAND) *.out
-#	@$(REMOVECOMMAND) *.OUT
-	@$(REMOVECOMMAND) makefi~1
-	@$(REMOVECOMMAND) __WCL__.LNK
-#	@$(REMOVECOMMAND) *.smp
-	@$(REMOVECOMMAND) *.SMP
+#
+clean: .symbolic
+	@$(REMOVECOMMAND) $(EXEC)
+	@$(REMOVECOMMAND) *.$(OBJ)
+	@$(REMOVECOMMAND) *.lib
+	@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) *.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_head.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)16_ca.* $(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 -qqq $(EXEC)
+
+updatelibs: .symbolic
+	cd $(JSMNLIB)
+	git pull
+	cd ../../../