merged makefile

[proj16/16.git] / makefile

diff --git a/makefile b/makefile
index 32cd430..bd4c4ee 100644 (file)
--- a/makefile
+++ b/makefile
@@ -10,20 +10,22 @@ REMOVECOMMAND=del
 DIRSEP=\\r
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)\r
-JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)\r
-EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
-WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
-\r
-all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe ftest.exe\r
-\r
-#\r
-#executables\r
-#\r
-16.exe: 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj\r
-       wcl $(FLAGS) 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj\r
-\r
-scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj\r
-       wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj# 16/lib/x/modex.lib\r
+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
+\r
+all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe ftest.exe \r
+
+#
+#executables
+#
+16.exe: 16.obj mapread.obj jsmn.obj 16.lib
+       wcl $(FLAGS) 16.obj mapread.obj jsmn.obj 16.lib
+\r
+scroll.exe: scroll.obj 16.lib mapread.obj jsmn.obj\r
+       wcl $(FLAGS) scroll.obj 16.lib mapread.obj jsmn.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
@@ -93,11 +95,14 @@ 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
+
+#
+#non executable objects libraries
+#
+16.lib: $(16LIBOBJS)\r
+       wlib -b 16.lib $(16LIBOBJS)
 \r
-#\r
-#non executable objects libraries\r
-#\r
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
@@ -116,11 +121,11 @@ scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
 wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
        wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
 \r
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
-\r
-fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c\r
+mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib\r
+       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+
+fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
+       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
 \r
 lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r