X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=9c6738c1711e673bcc8350aea5a14fe8bd83ef69;hb=c9827cf73d2e8de284981495424d74044afdfc13;hp=da282deded3794a659d227fd0f3223a6b48c802f;hpb=75e7cf251be21eb29a7c5df05b4b1320393214ff;p=16.git

diff --git a/makefile b/makefile
index da282ded..9c6738c1 100644
--- a/makefile
+++ b/makefile
@@ -2,92 +2,162 @@
 #-zk0 = kanji support~
 #-zkl = current codepage
 
-CFLAGS=-zkl -wo -x -mc# -mh# -zdp# -zp16 -zq
+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)
+FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
 REMOVECOMMAND=del
 DIRSEP=\
+OBJ=obj
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
-JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
+JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe far.exe emmtest.exe
+16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
 
-scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj
-	wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib
-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
+all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe
 
-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
+#
+#executables
+#
+16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 
-pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj lib_head.obj
+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
 
-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
-
-maptest0.exe: maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj
-
-emmtest.exe: emmtest.obj memory.obj
-	wcl $(FLAGS) emmtest.obj memory.obj
-
-far.exe: far.obj memory.obj
-	wcl $(FLAGS) far.obj memory.obj
+test2.exe: test2.$(OBJ) 16.lib
+	wcl $(FLAGS) test2.$(OBJ) 16.lib
+
+fonttest.exe: fonttest.$(OBJ) 16.lib
+	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
 
+inputest.exe: inputest.$(OBJ) 16.lib
+	wcl $(FLAGS) inputest.$(OBJ) 16.lib
+
+16text.$(OBJ): $(SRCLIB)16text.c
+	wcl -c $(SRCLIB)16text.c
+
+fonttest.$(OBJ): $(SRC)fonttest.c
+	wcl -c $(SRC)fonttest.c
+
+pcxtest.exe: pcxtest.$(OBJ) 16.lib
+	wcl $(FLAGS) pcxtest.$(OBJ) 16.lib
+
+palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
+	wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
+
+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
+
+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)# memory.$(OBJ)
+	wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)
 
-test.obj: $(SRC)test.c $(SRCLIB)modex16.h
+#
+#executable's objects
+#
+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
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test2.c
 
-pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.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) -c $(SRC)maptest0.c
-
-emmtest.obj: $(SRC)emmtest.c
-	wcl $(FLAGS) -c $(SRC)emmtest.c
+palettec.$(OBJ): $(SRC)palettec.c
+	wcl $(FLAGS) -c $(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
+
+emmtest.$(OBJ): $(SRC)emmtest.c
+	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.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
 
-far.obj: $(SRC)far.c
-	wcl $(FLAGS) -c $(SRC)far.c
+inputest.$(OBJ): $(SRC)inputest.c
+	wcl $(FLAGS) -c $(SRC)inputest.c
+
+#
+#non executable objects libraries
+#
+16.lib: $(16LIBOBJS) gfx.lib
+	wlib -b 16.lib $(16LIBOBJS) gfx.lib
 
+gfx.lib: $(GFXLIBOBJS)
+	wlib -b gfx.lib $(GFXLIBOBJS)
 
-modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
+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
+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
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
 
-planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c
+planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
 	wcl $(FLAGS) -c $(SRCLIB)planar.c
 
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c
-	wcl $(FLAGS) -c $(SRCLIB)mapread.c
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
+	wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 
-lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.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
+
+16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
+	wcl $(FLAGS) -c $(SRCLIB)16_in.c
+
+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
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
-
-memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c
-	wcl $(FLAGS) -c $(EXMMLIB)memory.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) *.OBJ
 #	@$(REMOVECOMMAND) *.out
 #	@$(REMOVECOMMAND) *.OUT