diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:38:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:38:33 +0000 |
| commit | 0783596ed6d2d9cd523736530d47a4d7837cd28c (patch) | |
| tree | 1c422bc4cd85491b55020e9a8cb594d4ac9207b5 /graphite/makefile.mk | |
| parent | 21194ebf2a74aea18e952be20e15fa886680a784 (diff) | |
CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
Diffstat (limited to 'graphite/makefile.mk')
| -rw-r--r-- | graphite/makefile.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 8b673709a971..5faa9054f98a 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -123,6 +123,15 @@ GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) GR_LIB_PATH= .ENDIF +.IF "$(OS)"=="WNT" +PATCH_FILES+=graphite-2.3.1.patch.mingw +EXTRA_GR_CXX_FLAGS=-nostdinc +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +EXTRA_GR_CXX_FLAGS+=-shared-libgcc +.ENDIF +EXTRA_GR_LD_FLAGS+=-no-undefined +.ENDIF + # don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail # CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' @@ -148,7 +157,7 @@ BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libgraphite.*.dylib .ELSE -.IF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll .IF "$(debug)"=="true" OUT2BIN= \ |