[Libreoffice-commits] .: 2 commits - graphite/graphite2.patch solenv/gbuild

[Tor Lillqvist]

 graphite/graphite2.patch           |    3 ++-
 solenv/gbuild/platform/winmingw.mk |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit beda88a2d715963e0cfaeb1d1ac38586df17058e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 24 10:11:05 2011 +0300

    We build graphite as a static library for MSVC

diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
index fcd486c..a13ef07 100644
--- a/graphite/graphite2.patch
+++ b/graphite/graphite2.patch
@@ -1,10 +1,11 @@
 --- misc/graphite2-1.0.2/include/graphite2/Types.h	2011-02-12 16:54:16.000000000 +0100
 +++ misc/build/graphite2-1.0.2/include/graphite2/Types.h	2011-03-15 21:38:06.264788098 +0100
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,8 @@
  };
  
  // Definitions for library publicly exported symbols
 -#if defined _WIN32 || defined __CYGWIN__
++#define GR2_STATIC 1
 +#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC
    #ifdef GR2_EXPORTING
      #ifdef __GNUC__
commit c0fa78c8a3280dc31dbf988d5abce102ce1cab47
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 24 08:56:48 2011 +0300

    Presumably we should use -MP here, too

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 5ebed04..a197174 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -240,7 +240,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-c $(3) \
 		-o $(1) \
 		-MMD -MT $(1) \
-		-MF $(4) \
+		-MP -MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE))
 endef
@@ -259,7 +259,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-c $(3) \
 		-o $(1) \
 		-MMD -MT $(1) \
-		-MF $(4) \
+		-MP -MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE))
 endef