X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=makefile;h=cba89784a48b0595e99a55070de2237f1e61f222;hb=cb1e2d6d3b2dc7a316ca19e9a5277e2f63b39337;hp=a5c9a375b4bf76fd56e64c85324a4a373eb92c0f;hpb=fa22c78a917561d4abf178f8c4f51b9526f665cf;p=16.git

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