diff options
| author | Keith Stribley <devel@thanlwinsoft.org> | 2010-06-29 14:14:34 +0630 |
|---|---|---|
| committer | Keith Stribley <devel@thanlwinsoft.org> | 2010-06-29 14:14:34 +0630 |
| commit | 226e11dc0d822c203f2f0ed29f14b20dc53c5e00 (patch) | |
| tree | 3afc5b2c02fa53e8c019a3f8fa0b60bba84ccfe8 /graphite/makefile.mk | |
| parent | bf6f60cab3d8629c4f2f141143ee18a2c9ef2aa0 (diff) | |
graphite03: #i112730# updated graphite patch and improvements to glyph metric caching
Diffstat (limited to 'graphite/makefile.mk')
| -rw-r--r-- | graphite/makefile.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 2f4ff2535442..58735e1d6a7d 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -51,7 +51,8 @@ PATCH_FILES=graphite-2.3.1.patch # convert line-endings to avoid problems when patching CONVERTFILES=\ - engine/makefile.vc8 + engine/makefile.vc8 \ + engine/test/RegressionTest/RtTextSrc.h #.IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #CONFIGURE_DIR=win32 @@ -72,14 +73,18 @@ EXT_USE_STLPORT=TRUE BUILD_ACTION=nmake VERBOSE=1 .IF "$(debug)"=="true" BUILD_FLAGS= "CFG=DEBUG" +CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!) +.ELSE +# Speed Optimization is really needed for Graphite +CFLAGSWITHPATH= $(CFLAGS) /O2 .ENDIF ### convert CFLAGS as cl.exe cannot handle OOO"s generic ones directly ### TODO: use "guw.exe" instead? -ALLCFLAGS= $(CFLAGS) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS) +ALLCFLAGS= $(CFLAGSWITHPATH) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS) JUSTASLASH= / CFLAGS2MSC= $(ALLCFLAGS:s/-Z/$(JUSTASLASH)Z/) CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/) -BUILD_FLAGS+= "MLIB=MD" "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) dll +BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll .ENDIF .IF "$(COM)"=="GCC" @@ -138,11 +143,11 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib #OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll .IF "$(debug)"=="true" OUT2BIN= \ - engine$/debug$/*.dll \ +# engine$/debug$/*.dll \ engine$/debug$/*.pdb .ELSE -OUT2BIN= \ - engine$/release$/*.dll +OUT2BIN= +# engine$/release$/*.dll # engine$/release$/*.pdb .ENDIF .ELSE |