X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=2a53a385828c4291081c4e809c79ec120220841c;hb=382c52a610e89948ad695a356879daf54653bb4c;hp=508993152b3f4fd4e004950289f82752250d0bdc;hpb=fef81dd6303c46812f27d4378e0af7c11e2073a8;p=16.git

diff --git a/makefile b/makefile
index 50899315..2a53a385 100644
--- a/makefile
+++ b/makefile
@@ -1,37 +1,54 @@
 FLAGS=-0 -d2 
+SRC=src\
+SRCLIB=$(SRC)lib\
 all: test.exe pcxtest.exe test2.exe scroll.exe
 
-scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj
-	wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj
-scroll.obj: scroll.c
-	wcl $(FLAGS) -c scroll.c
+scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj
+	wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj# 16\lib\x\modex.lib
+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
-	wcl $(FLAGS) test2.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
 
-test.obj: test.c modex16.h
-	wcl $(FLAGS) -c test.c
+#maptest.exe: maptest.obj mapread.obj jsmn.obj
+#        wcl $(FLAGS) maptest.obj jsmn.obj
+
+test.obj: $(SRC)test.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)test.c
 	
-test2.obj: test2.c modex16.h
-	wcl $(FLAGS) -c test2.c
+test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)test2.c
 	
-pcxtest.obj: pcxtest.c modex16.h
-	wcl $(FLAGS) -c pcxtest.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
+
+modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
+	wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
-modex16.obj: modex16.h modex16.c
-	wcl $(FLAGS) -c modex16.c
+dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
+	wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
 
-dos_kb.obj: dos_kb.h dos_kb.c
-	wcl $(FLAGS) -c dos_kb.c
+bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
+	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
 
-bitmap.obj: bitmap.h bitmap.c
-	wcl $(FLAGS) -c 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
+	wcl $(FLAGS) -c $(SRCLIB)mapread.c
+
+jsmn.obj: $(SRCLIB)jsmn\jsmn.h $(SRCLIB)jsmn\jsmn.c
+	wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c
+
 clean: 
 	del *.obj
-	del *.exe
+#	del *.exe