X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=dc07fb5d758e53e3704946f4e77cf9d3d8dbf35d;hb=a795b980582ebc833763a1e61cc0eaf84c0d647c;hp=723216e76b4f3ca58b5321408974bfaf2840280c;hpb=75a35fd2843da7105acc7eee68674131431d0ccb;p=16.git diff --git a/makefile b/makefile index 723216e7..dc07fb5d 100755 --- a/makefile +++ b/makefile @@ -64,7 +64,7 @@ AFLAGS=-mh -0 -d1 BAKAPIFLAGS=-fh=bakapi.hed SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) -ZFLAGS=-zk0 -zq -zc -zp8# -zm +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) @@ -83,7 +83,7 @@ TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.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 @@ -91,8 +91,9 @@ 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 modex.lib - wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib modex.lib -fm=bakapi.map +bakapi.exe: bakapi.$(OBJ) gfx.lib modex.lib +#$(16LIBOBJS) + wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib modex.lib -fm=bakapi.map # #Test Executables! # @@ -422,13 +423,21 @@ clean: .symbolic # @echo $(INCLUDE) comp: .symbolic - @upx -9 -qqq $(EXEC) - @upx -9 -qqq x-demo.exe + @upx -9 $(EXEC) +## @upx -9 -qqq x-demo.exe + +#git submodule add +uplibs: .symbolic + @wmake updatelibs updatelibs: .symbolic @cd $(JSMNLIB) @git pull @cd ../../../ + @cd $(DOSLIB) + @git pull + @./buildall.sh + @cd ../../../ xlib: .symbolic @cd 16/xlib