wwww ok

[16.git] / makefile

diff --git a/makefile b/makefile
index 3be8bca9d8b3ebaf8fefd3d78516cab1ca5868aa..9c6738c1711e673bcc8350aea5a14fe8bd83ef69 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,9 +15,10 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
 \r
-16LIBOBJS = modex16.$(OBJ) dos_kb.$(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 \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
 #\r
 #executables\r
@@ -25,18 +26,21 @@ 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\r
        wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
 \r
-scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)\r
-       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)\r
+scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)\r
+       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)\r
+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
 \r
 16text.$(OBJ): $(SRCLIB)16text.c\r
        wcl -c $(SRCLIB)16text.c\r
@@ -44,17 +48,17 @@ fonttest.exe: 16text.$(OBJ) fonttest.$(OBJ)
 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
@@ -96,13 +100,19 @@ emsdump.$(OBJ): $(SRC)emsdump.c
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c\r
 \r
 fmemtest.$(OBJ): $(SRC)fmemtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c\r
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+
+inputest.$(OBJ): $(SRC)inputest.c\r
+       wcl $(FLAGS) -c $(SRC)inputest.c\r
 \r
 #\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
@@ -126,7 +136,10 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
        wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib\r
 \r
 fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
+       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\r
 \r
 lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
@@ -138,8 +151,8 @@ farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
        wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c\r
 \r
 memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c\r
-\r
+       wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
+
 #\r
 #other~\r
 #\r