diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:49:22 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:49:22 +0200 |
| commit | fd0afc269de8e1517d2287e9c0b407e22602fc26 (patch) | |
| tree | 8409ff857e7c313cea44c6fcc8cc35dd78a9c5d1 /graphite/makefile.mk | |
| parent | e159c70f5403454847a1fd0cb8faf077b7323ef6 (diff) | |
| parent | 226e11dc0d822c203f2f0ed29f14b20dc53c5e00 (diff) | |
CWS-TOOLING: integrate CWS graphite03_OOO330
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 471bc3c366d7..b9ecb7aea396 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 |