X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=makefile;h=6c388c71f96fff09e1224c685f9f688ae62d342d;hb=c5768c755dd854ac30dce76f6a418950031288b1;hp=a43cf7e5bc7ffdadba5ae0dca8a47b3108bccf00;hpb=e600b06ae138ce44897e263457fc72668ac3775e;p=16.git

diff --git a/makefile b/makefile
index a43cf7e5..6c388c71 100755
--- a/makefile
+++ b/makefile
@@ -52,13 +52,14 @@ SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 NYANLIB=$(SRCLIB)nyan$(DIRSEP)
 #EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+MODEXLIB=$(SRCLIB)modex16$(DIRSEP)
 VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
 DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 16FLAGS=-fh=16.hed
 BAKAPIFLAGS=-fh=bakapi.hed
-SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k56000#60000#32768
+SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zq -zc -zp8# -zm
 CFLAGS=$(IFLAGS) -mh -lr -l=dos -wo# -d2##wwww
@@ -71,9 +72,9 @@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) timer.$(OBJ)
 #
 #3812intf.$(OBJ)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ)
 
-TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe
+TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
 # tsthimem.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
@@ -106,8 +107,8 @@ tesuto.$(OBJ): $(SRC)tesuto.c
 #sega.$(OBJ): $(SRC)sega.c
 #	wcl $(FLAGS) -c $(SRC)sega.c
 
-test.exe: test.$(OBJ) gfx.lib
-	wcl $(FLAGS) test.$(OBJ) gfx.lib -fm=test.map
+test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ)
+	wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) -fm=test.map
 
 test2.exe: test2.$(OBJ) gfx.lib
 	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map
@@ -151,6 +152,9 @@ palettel.exe: palettel.$(OBJ) $(16LIBOBJS) gfx.lib
 pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
 	wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map
 
+planrpcx.exe: planrpcx.$(OBJ) gfx.lib
+	wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.map
+
 maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
 	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=maptest.map
 
@@ -192,6 +196,9 @@ test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
 pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.c
 
+planrpcx.$(OBJ): $(SRC)planrpcx.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)planrpcx.c
+
 pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest2.c
 
@@ -271,6 +278,12 @@ modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c
 	wcl $(FLAGS) -c $(SRCLIB)bakapee.c
 
+16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c
+	wcl $(FLAGS) -c $(MODEXLIB)16render.c
+
+16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c
+	wcl $(FLAGS) -c $(MODEXLIB)16planar.c
+
 bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 	wcl $(FLAGS) -c $(SRCLIB)bitmap.c