[Libreoffice-commits] core.git: vcl/generic vcl/inc vcl/source

[Michael Meeks]

 vcl/generic/glyphs/gcach_ftyp.cxx     |    5 +++--
 vcl/inc/graphite_features.hxx         |    1 +
 vcl/inc/graphite_layout.hxx           |    1 +
 vcl/inc/graphite_static.hxx           |   17 +++++++++++++++++
 vcl/inc/win/salgdi.h                  |    3 ++-
 vcl/source/glyphs/graphite_layout.cxx |    1 +
 6 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 8949d6f32acb9046cb3ddceb4f6fbe39dcc04383
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Dec 13 13:20:10 2013 +0000

    graphite2: get visibility right for static linkage on windows.
    
    Change-Id: I79fa15d539bcb86610dd4def08536c33bd2a10c2

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index b153e5c..62d114e 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -26,8 +26,9 @@
 #include <config_features.h>
 #include <config_graphite.h>
 #if ENABLE_GRAPHITE
-#include <graphite2/Font.h>
-#include <graphite_layout.hxx>
+#  include <graphite_static.hxx>
+#  include <graphite2/Font.h>
+#  include <graphite_layout.hxx>
 #endif
 #include <unotools/fontdefs.hxx>
 
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index da8e619..0202497 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -23,6 +23,7 @@
 // 1001=1&2002=2&fav1=0
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
+#include <graphite_static.hxx>
 #include <graphite2/Font.h>
 
 namespace grutils
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 30fe111..ce8989c 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -31,6 +31,7 @@
 #include <map>
 #include <utility>
 // Libraries
+#include <graphite_static.hxx>
 #include <graphite2/Font.h>
 #include <graphite2/Segment.h>
 // Platform
diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx
new file mode 100644
index 0000000..4c70cf1
--- /dev/null
+++ b/vcl/inc/graphite_static.hxx
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifdef WNT
+#  ifndef GRAPHITE2_STATIC
+#    define GRAPHITE2_STATIC 1
+#  endif
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 2441252..f29fd94 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -31,7 +31,8 @@
 
 #include <config_graphite.h>
 #if ENABLE_GRAPHITE
-#include <graphite2/Font.h>
+#  include <graphite_static.hxx>
+#  include <graphite2/Font.h>
 #endif
 
 class FontSelectPattern;
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index b4498cf..0231bb4 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -49,6 +49,7 @@
 #include <unicode/uscript.h>
 
 // Graphite Libraries (must be after vcl headers on windows)
+#include <graphite_static.hxx>
 #include <graphite2/Segment.h>
 
 #include <graphite_layout.hxx>