X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=d49ccf9e743813405f6c37773de92eea2c8724ec;hb=dcc1d618049a97145f56a81b42de52928a19ff54;hp=aa6373e23a78b5df979462ab3459ec10e73f6422;hpb=870f290d0af578c5dbdd58d1ac5ddd91c92f2d6d;p=16.git

diff --git a/makefile b/makefile
index aa6373e2..d49ccf9e 100644
--- a/makefile
+++ b/makefile
@@ -15,9 +15,10 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = modex16.$(OBJ) dos_kb.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(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
+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 exmmtest.exe
 
 #
 #executables
@@ -25,39 +26,33 @@ all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe m
 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.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) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)
-	wcl $(FLAGS) test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)
+test.exe: test.$(OBJ) 16.lib
+	wcl $(FLAGS) test.$(OBJ) 16.lib
 
-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)
+test2.exe: test2.$(OBJ) 16.lib
+	wcl $(FLAGS) test2.$(OBJ) 16.lib
 
-fonttest.exe: 16text.$(OBJ) fonttest.$(OBJ)
-	wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)
-
-inputest.exe: inputest.$(OBJ) 16_in.$(OBJ) lib_head.$(OBJ)
-	wcl $(FLAGS) inputest.$(OBJ) 16_in.$(OBJ) lib_head.$(OBJ)
+fonttest.exe: fonttest.$(OBJ) 16.lib
+	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
 
-16text.$(OBJ): $(SRCLIB)16text.c
-	wcl -c $(SRCLIB)16text.c
-
-fonttest.$(OBJ): $(SRC)fonttest.c
-	wcl -c $(SRC)fonttest.c
+inputest.exe: inputest.$(OBJ) 16.lib
+	wcl $(FLAGS) inputest.$(OBJ) 16.lib
 
-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)
+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) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)
-	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(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)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)
-	wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)
+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)
@@ -68,6 +63,9 @@ emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
 fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)
 	wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)
 
+exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
+        wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)
+
 #
 #executable's objects
 #
@@ -99,16 +97,25 @@ 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) $(MFLAGS) -c $(SRC)fmemtest.c
+
+fonttest.$(OBJ): $(SRC)fonttest.c
+	wcl -c $(SRC)fonttest.c
+
 inputest.$(OBJ): $(SRC)inputest.c
 	wcl $(FLAGS) -c $(SRC)inputest.c
 
+exmmtest.$(OBJ): $(SRC)exmmtest.c
+	wcl $(FLAGS) $(MFLAGS) -c $(SRC)exmmtest.c
+
 #
 #non executable objects libraries
 #
-16.lib: $(16LIBOBJS)
-	wlib -b 16.lib $(16LIBOBJS)
+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
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
@@ -128,15 +135,21 @@ scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
 wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 
+16text.$(OBJ): $(SRCLIB)16text.c
+	wcl -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
-
-16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
+	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
+
 lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
 	wcl $(FLAGS) -c $(SRCLIB)lib_head.c
 
@@ -147,8 +160,8 @@ 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
-
+	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
+
 #
 #other~
 #