fack!!!! wwww

[16.git] / makefile

diff --git a/makefile b/makefile
index a5c9a375b4bf76fd56e64c85324a4a373eb92c0f..cba89784a48b0595e99a55070de2237f1e61f222 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,7 +1,11 @@
-FLAGS=-0 -d2 -mh\r
-SRC=src\\r
-SRCLIB=$(SRC)lib\\r
-all: test.exe pcxtest.exe test2.exe scroll.exe\r
+OFLAGS=-ot -ox -ob -ol -oh -or
+FLAGS=-0 -d2 -mh -wo $(OFLAGS)
+DIRSEP=\
+SRC=src$(DIRSEP)\r
+SRCLIB=$(SRC)lib$(DIRSEP)
+JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
+\r
+all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe\r
 \r
 scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj\r
        wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib\r
@@ -9,27 +13,29 @@ scroll.obj: $(SRC)scroll.c
        wcl $(FLAGS) -c $(SRC)scroll.c\r
 test.exe: test.obj modex16.obj bitmap.obj\r
        wcl $(FLAGS) test.obj modex16.obj bitmap.obj\r
-       \r
+\r
 test2.exe: test2.obj modex16.obj bitmap.obj planar.obj\r
        wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj\r
-       \r
+\r
 pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj\r
        wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj\r
 \r
-#maptest.exe: maptest.obj mapread.obj jsmn.obj\r
-#        wcl $(FLAGS) maptest.obj jsmn.obj\r
+maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj\r
+       wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj\r
+\r
 \r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r
-       \r
+\r
 test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test2.c\r
-       \r
+\r
 pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 \r
-#maptest.obj: $(SRC)maptest.c $(SRCLIB)mapread.h\r
-#        wcl $(FLAGS) -c $(SRC)maptest.c\r
+maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h\r
+       wcl $(FLAGS) -c $(SRC)maptest.c\r
+
 \r
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
@@ -42,16 +48,16 @@ bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 \r
 planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
        wcl $(FLAGS) -c $(SRCLIB)planar.c\r
-       \r
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c jsmn.obj lib_head.obj\r
+\r
+mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c lib_head.obj jsmn.obj\r
        wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
 \r
 lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
 \r
-jsmn.obj: $(SRCLIB)jsmn\jsmn.h $(SRCLIB)jsmn\jsmn.c\r
-       wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c\r
+jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
+       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
 \r
-clean: \r
+clean:\r
        del *.obj\r
 #      del *.exe\r