X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=97679804295e489ad9121093c259e6b8dca04248;hb=3f9446b584875f1f8b06b9b2a5600b43ccfa8e85;hp=0af5c1d3fc2154c54cc129204dc9ba578b4241f4;hpb=a4facf06a902997ce6d588e8518822cc407b62d8;p=16.git

diff --git a/makefile b/makefile
index 0af5c1d3..97679804 100644
--- a/makefile
+++ b/makefile
@@ -1,24 +1,34 @@
+!ifdef __LINUX__
+REMOVECOMMAND=rm
+DIRSEP=/
+OBJ=o
+!else
+REMOVECOMMAND=del
+DIRSEP=\
+OBJ=obj
+!endif
+TARGET_OS = dos
 #-zk0u = translate kanji to unicode... wwww
 #-zk0 = kanji support~
 #-zkl = current codepage
 
-MFLAGS=-mh# -zm
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
+DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm
+CFLAGS=-zk0 -wo -x -mc -zu# -zdp# -zp16 -zq
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
-REMOVECOMMAND=del
-DIRSEP=\
-OBJ=obj
+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) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(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 maptest0.exe emsdump.exe emmtest.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 testemm.exe tsthimem.exe inputest.exe testemm0.exe
 
 #
 #executables
@@ -30,41 +40,62 @@ scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
 	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
 scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
-test.exe: test.$(OBJ) 16.lib
-	wcl $(FLAGS) test.$(OBJ) 16.lib
+test.exe: test.$(OBJ) gfx.lib
+	wcl $(FLAGS) test.$(OBJ) gfx.lib
 
-test2.exe: test2.$(OBJ) 16.lib
-	wcl $(FLAGS) test2.$(OBJ) 16.lib
+test2.exe: test2.$(OBJ) gfx.lib
+	wcl $(FLAGS) 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
 
-pcxtest.exe: pcxtest.$(OBJ) 16.lib
-	wcl $(FLAGS) pcxtest.$(OBJ) 16.lib
+miditest.exe: miditest.$(OBJ) 16.lib
+	wcl $(FLAGS) miditest.$(OBJ) 16.lib
 
-palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
-	wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
+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) 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
 
-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)# 16.lib
+#	wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
 
-emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)
-	wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(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)
+#emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
+#	wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
 
-fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)
-	wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)
+fmemtest.exe: fmemtest.$(OBJ) 16.lib
+	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
 
-exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
-        wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)
+exmmtest.exe: exmmtest.$(OBJ) 16.lib
+	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
 
 #
 #executable's objects
@@ -87,41 +118,65 @@ palettec.$(OBJ): $(SRC)palettec.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
+#emmtest.$(OBJ): $(SRC)emmtest.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
 
-emsdump.$(OBJ): $(SRC)emsdump.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
+#emsdump.$(OBJ): $(SRC)emsdump.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
 
 fmemtest.$(OBJ): $(SRC)fmemtest.c
-	wcl $(FLAGS) $(MFLAGS) -c $(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) $(MFLAGS) -c $(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
 
-dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
-	wcl $(FLAGS) -c $(SRCLIB)dos_kb.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
@@ -136,41 +191,78 @@ 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
 
-fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
-	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
+#fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
 
 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) $(MFLAGS) -c $(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
 
-lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
-	wcl $(FLAGS) -c $(SRCLIB)lib_head.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
 
 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
+#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
+#memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
 
 #
 #other~
 #
 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
+