X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=2a735ead81b19c4ad88b52f9af9bd43a493903e4;hb=482dcb216b9068878dbfcf8265d9b7fd2cdc82a2;hp=dbdf3324cab767ec55365d97eeed7bf743f3a7a2;hpb=b0905fc2339b98330b0891bcc153b8aea07784b4;p=16.git

diff --git a/makefile b/makefile
index dbdf3324..2a735ead 100755
--- a/makefile
+++ b/makefile
@@ -22,6 +22,10 @@
 # -0    8088/8086 class code generation
 # -s    disable stack overflow checking
 
+# -zk0u	translate kanji to unicode... wwww
+# -zk0	kanji support~
+# -zkl		current codepage
+
 #%.C
 #192x144
 #wwww will add these
@@ -42,9 +46,6 @@ OBJ=obj
 #!endif
 
 TARGET_OS = dos
-#-zk0u = translate kanji to unicode... wwww
-#-zk0 = kanji support~
-#-zkl = current codepage
 
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 SRC=src$(DIRSEP)
@@ -53,33 +54,36 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 NYANLIB=$(SRCLIB)nyan$(DIRSEP)
 #EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 MODEXLIB=$(SRCLIB)modex16$(DIRSEP)
+MODEXLIB_=$(SRCLIB)modex$(DIRSEP)
 VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
 DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
+AFLAGS=-mh -0 -d1
 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
-OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
+ZFLAGS=-zk0 -zc -zp8# -zq ## -zm
+CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##wwww
+OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
+
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 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) 16render.$(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 planrpcx.exe
 # tsthimem.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
 
-all: $(EXEC) comp
+all: $(EXEC)
 
 #
 #game and bakapi executables
@@ -87,8 +91,8 @@ all: $(EXEC) comp
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
 	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map
 
-bakapi.exe: bakapi.$(OBJ) $(16LIBOBJS) gfx.lib
-	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib -fm=bakapi.map
+bakapi.exe: bakapi.$(OBJ) $(16LIBOBJS) gfx.lib modex.lib
+	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib modex.lib -fm=bakapi.map
 #
 #Test Executables!
 #
@@ -281,6 +285,9 @@ bakapee.$(OBJ): $(SRCLIB)bakapee.h $(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
 
@@ -369,13 +376,21 @@ vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
 #memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
 #	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
 
+c_utils.$(OBJ): $(MODEXLIB_)c_utils.asm
+	wcl -c $(AFLAGS) $(MODEXLIB_)c_utils.asm
+modex.$(OBJ): $(MODEXLIB_)modex.asm
+	wcl -c $(AFLAGS) $(MODEXLIB_)modex.asm
+
 #
 #other~
 #
 clean: .symbolic
 	@$(REMOVECOMMAND) $(EXEC)
 	@$(REMOVECOMMAND) *.$(OBJ)
-	@$(REMOVECOMMAND) *.lib
+	@$(REMOVECOMMAND) 16.lib
+	@$(REMOVECOMMAND) gfx.lib
+	@$(REMOVECOMMAND) doslib.lib
+	@$(REMOVECOMMAND) vgmsnd.lib
 	@wlib -n 16.lib
 	@wlib -n  gfx.lib
 	@wlib -n  doslib.lib
@@ -407,9 +422,36 @@ clean: .symbolic
 #	@echo $(INCLUDE)
 
 comp: .symbolic
-	@upx -9 -qqq $(EXEC)
+	@upx -9 $(EXEC)
+##	@upx -9 -qqq x-demo.exe
+
+#git submodule add <repo>
+uplibs: .symbolic
+	@wmake updatelibs
 
 updatelibs: .symbolic
-	cd $(JSMNLIB)
-	git pull
-	cd ../../../
+	@cd $(JSMNLIB)
+	@git pull
+	@cd ../../../
+        @cd $(DOSLIB)
+        @git pull
+	@./buildall.sh
+        @cd ../../../
+
+xlib: .symbolic
+	@cd 16/xlib
+	@wmake clean
+	@wmake all
+	@cd ../../
+
+mx: .symbolic
+	@cd 16/xw
+#	@wmake clean
+	@wmake all
+	@cd ../../
+
+mx_: .symbolic
+	@cd 16/xw_
+	@wmake -f makefile all
+	@cd ../../
+