X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=6b868df86c7ef38793ae0a052bc043f70ed1d631;hb=12aaf3aedda737dd454e62e2bd96594afe63e156;hp=8a8567516874011af112dc72921a510d35485140;hpb=17998320acbe20dc2bbca909922109fc65e82e9f;p=16.git

diff --git a/makefile b/makefile
index 8a856751..6b868df8 100644
--- a/makefile
+++ b/makefile
@@ -12,20 +12,24 @@ TARGET_OS = dos
 #-zk0 = kanji support~
 #-zkl = current codepage
 
-#MFLAGS=-mc# -zm
-CFLAGS=-zkl -wo -x -mc# -zdp# -zp16 -zq
+DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm
+CFLAGS=-zk0 -wo -x -mc -zu -k32768#-k48000# -zdp# -zp16 -zq
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
+FLAGS=-0 -d1 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) #-d2
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ) 16_ca.$(OBJ)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
+DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
+DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
+all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe exmmtest.exe fonttes0.exe fontgfx.exe sountest.exe miditest.exe tsthimem.exe inputest.exe
+#testemm.exe testemm0.exe
 
 #
 #executables
@@ -46,14 +50,35 @@ test2.exe: test2.$(OBJ) gfx.lib
 fonttest.exe: fonttest.$(OBJ) 16.lib
 	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
 
+fonttes0.exe: fonttes0.$(OBJ) 16.lib
+	wcl $(FLAGS) fonttes0.$(OBJ) 16.lib
+
+fontgfx.exe: fontgfx.$(OBJ) 16.lib
+	wcl $(FLAGS) fontgfx.$(OBJ) 16.lib
+
 inputest.exe: inputest.$(OBJ) 16.lib
-	wcl $(FLAGS) inputest.$(OBJ) 16.lib
+	wcl $(FLAGS) -D__DEBUG_InputMgr__=1 inputest.$(OBJ) 16.lib
+
+sountest.exe: sountest.$(OBJ) 16.lib
+	wcl $(FLAGS) sountest.$(OBJ) 16.lib
+
+miditest.exe: miditest.$(OBJ) 16.lib
+	wcl $(FLAGS) miditest.$(OBJ) 16.lib
+
+tsthimem.exe: tsthimem.$(OBJ) 16.lib
+	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib
+
+testemm.exe: testemm.$(OBJ) 16.lib
+	wcl $(FLAGS) testemm.$(OBJ) 16.lib
+
+testemm0.exe: testemm0.$(OBJ) 16.lib
+	wcl $(FLAGS) testemm0.$(OBJ) 16.lib
 
 pcxtest.exe: pcxtest.$(OBJ) gfx.lib
 	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib
 
-palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
-	wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
+palettec.exe: palettec.$(OBJ) 16.lib
+	wcl $(FLAGS) palettec.$(OBJ) 16.lib
 
 maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
@@ -71,7 +96,7 @@ fmemtest.exe: fmemtest.$(OBJ) 16.lib
 	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
 
 exmmtest.exe: exmmtest.$(OBJ) 16.lib
-        wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
+	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
 
 #
 #executable's objects
@@ -107,23 +132,47 @@ fmemtest.$(OBJ): $(SRC)fmemtest.c
 	wcl $(FLAGS) -c $(SRC)fmemtest.c
 
 fonttest.$(OBJ): $(SRC)fonttest.c
-	wcl -c $(SRC)fonttest.c
+	wcl $(FLAGS) -c $(SRC)fonttest.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
 
 #
 #non executable objects libraries
 #
-16.lib: $(16LIBOBJS) gfx.lib
-	wlib -b 16.lib $(16LIBOBJS) gfx.lib
+16.lib: $(16LIBOBJS) gfx.lib doslib.lib
+	wlib -b 16.lib $(16LIBOBJS) gfx.lib doslib.lib
 
 gfx.lib: $(GFXLIBOBJS)
 	wlib -b gfx.lib $(GFXLIBOBJS)
 
+doslib.lib: $(DOSLIBOBJ) $(DOSLIBEXMMOBJ)# $(SRCLIB)cpu.lib
+	wlib -b doslib.lib $(DOSLIBOBJ) $(DOSLIBEXMMOBJ)# $(SRCLIB)cpu.lib
+
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
@@ -143,7 +192,7 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 
 16text.$(OBJ): $(SRCLIB)16text.c
-	wcl -c $(SRCLIB)16text.c
+	wcl $(FLAGS) -c $(SRCLIB)16text.c
 
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
 	wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
@@ -160,6 +209,35 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
 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
+
 16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
 	wcl $(FLAGS) -c $(SRCLIB)16_head.c
 
@@ -177,11 +255,15 @@ jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 #
 clean: .symbolic
 	@$(REMOVECOMMAND) *.$(OBJ)
+	@$(REMOVECOMMAND) *.lib
+	@wlib -n 16.lib
+	@wlib -n  gfx.lib
 #	@$(REMOVECOMMAND) *.OBJ
 #	@$(REMOVECOMMAND) *.out
 #	@$(REMOVECOMMAND) *.OUT
-	@$(REMOVECOMMAND) makefi~1
-	@$(REMOVECOMMAND) __WCL__.LNK
+#	@$(REMOVECOMMAND) makefi~1
+#	@$(REMOVECOMMAND) makefile~
+#	@$(REMOVECOMMAND) __WCL__.LNK
 #	@$(REMOVECOMMAND) *.smp
-	@$(REMOVECOMMAND) *.SMP
+#	@$(REMOVECOMMAND) *.SMP