wwww ok

[16.git] / makefile

diff --git a/makefile b/makefile
index f551eca6caf0980a5c185228cd5c2b7cd52ae78d..9c6738c1711e673bcc8350aea5a14fe8bd83ef69 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,7 +15,8 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
 \r
-16LIBOBJS = 16_in.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ)\r
+16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)\r
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
 \r
 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\r
 \r
@@ -29,14 +30,14 @@ 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)\r
 scroll.$(OBJ): $(SRC)scroll.c\r
        wcl $(FLAGS) -c $(SRC)scroll.c\r
-test.exe: test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+test.exe: test.$(OBJ) 16.lib\r
+       wcl $(FLAGS) test.$(OBJ) 16.lib\r
 \r
-test2.exe: test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+test2.exe: test2.$(OBJ) 16.lib\r
+       wcl $(FLAGS) test2.$(OBJ) 16.lib\r
 \r
-fonttest.exe: 16text.$(OBJ) fonttest.$(OBJ)\r
-       wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)
+fonttest.exe: fonttest.$(OBJ) 16.lib\r
+       wcl $(FLAGS) fonttest.$(OBJ) 16.lib
 
 inputest.exe: inputest.$(OBJ) 16.lib\r
        wcl $(FLAGS) inputest.$(OBJ) 16.lib\r
@@ -47,17 +48,17 @@ inputest.exe: inputest.$(OBJ) 16.lib
 fonttest.$(OBJ): $(SRC)fonttest.c\r
        wcl -c $(SRC)fonttest.c\r
 \r
-pcxtest.exe: pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+pcxtest.exe: pcxtest.$(OBJ) 16.lib\r
+       wcl $(FLAGS) pcxtest.$(OBJ) 16.lib\r
 \r
 palettec.exe: palettec.$(OBJ) modex16.$(OBJ)\r
        wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)\r
 \r
-maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
+       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
 \r
-maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib\r
+       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib\r
 \r
 emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)\r
        wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)\r
@@ -107,8 +108,11 @@ inputest.$(OBJ): $(SRC)inputest.c
 #\r
 #non executable objects libraries\r
 #\r
-16.lib: $(16LIBOBJS)\r
-       wlib -b 16.lib $(16LIBOBJS)\r
+16.lib: $(16LIBOBJS) gfx.lib\r
+       wlib -b 16.lib $(16LIBOBJS) gfx.lib
+
+gfx.lib: $(GFXLIBOBJS)\r
+       wlib -b gfx.lib $(GFXLIBOBJS)\r
 \r
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r