X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=8a8567516874011af112dc72921a510d35485140;hb=4a3d30521e890c1777d254f2bcceacefc53c5454;hp=2d65a108fa48691e71e1e9195c3a095f560e9bf2;hpb=8b0bb4c958df11e844f73c6fc41de3e7d8bbbbe3;p=16.git

diff --git a/makefile b/makefile
index 2d65a108..8a856751 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@ REMOVECOMMAND=rm
 DIRSEP=/
 OBJ=o
 !else
-REMOVECOMMAND=del 
+REMOVECOMMAND=del
 DIRSEP=\
 OBJ=obj
 !endif
@@ -13,7 +13,7 @@ TARGET_OS = dos
 #-zkl = current codepage
 
 #MFLAGS=-mc# -zm
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
+CFLAGS=-zkl -wo -x -mc# -zdp# -zp16 -zq
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
 FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
 SRC=src$(DIRSEP)
@@ -22,7 +22,7 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ) 16_ca.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
 
 all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
@@ -37,11 +37,11 @@ scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
 	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
 scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
-test.exe: test.$(OBJ) 16.lib
-	wcl $(FLAGS) test.$(OBJ) 16.lib
+test.exe: test.$(OBJ) gfx.lib
+	wcl $(FLAGS) test.$(OBJ) gfx.lib
 
-test2.exe: test2.$(OBJ) 16.lib
-	wcl $(FLAGS) test2.$(OBJ) 16.lib
+test2.exe: test2.$(OBJ) gfx.lib
+	wcl $(FLAGS) test2.$(OBJ) gfx.lib
 
 fonttest.exe: fonttest.$(OBJ) 16.lib
 	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
@@ -49,8 +49,8 @@ fonttest.exe: fonttest.$(OBJ) 16.lib
 inputest.exe: inputest.$(OBJ) 16.lib
 	wcl $(FLAGS) inputest.$(OBJ) 16.lib
 
-pcxtest.exe: pcxtest.$(OBJ) 16.lib
-	wcl $(FLAGS) pcxtest.$(OBJ) 16.lib
+pcxtest.exe: pcxtest.$(OBJ) gfx.lib
+	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib
 
 palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
 	wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
@@ -67,11 +67,11 @@ maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 #emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
 #	wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
 
-fmemtest.exe: fmemtest.$(OBJ)
-	wcl $(FLAGS) fmemtest.$(OBJ)
+fmemtest.exe: fmemtest.$(OBJ) 16.lib
+	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
 
-exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
-        wcl $(FLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)
+exmmtest.exe: exmmtest.$(OBJ) 16.lib
+        wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
 
 #
 #executable's objects
@@ -157,8 +157,11 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
 16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
 	wcl $(FLAGS) -c $(SRCLIB)16_mm.c
 
-lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
-	wcl $(FLAGS) -c $(SRCLIB)lib_head.c
+16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
+	wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+
+16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
+	wcl $(FLAGS) -c $(SRCLIB)16_head.c
 
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c