summaryrefslogtreecommitdiff
path: root/external/graphite
diff options
context:
space:
mode:
authorMartin Hosken <martin_hosken@sil.org>2015-09-17 08:04:48 +0700
committerMartin Hosken <martin_hosken@sil.org>2015-09-17 06:10:12 +0000
commit23b9febbd883f9db77ffb0216b050aaabc4c6510 (patch)
treecbd6c0ec4068137e25466f1fe34352ca5e74ab7e /external/graphite
parentf2b93f2e314215d6342e0bd5727e6740cc15e29c (diff)
Fix Graphite windows build static
Change-Id: I6feb3805e79f7cae4a8df7efa665fd97c56411c2 Reviewed-on: https://gerrit.libreoffice.org/18654 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Martin Hosken <martin_hosken@sil.org>
Diffstat (limited to 'external/graphite')
-rw-r--r--external/graphite/StaticLibrary_graphite.mk2
-rw-r--r--external/graphite/graphite2.win64.patch.111
2 files changed, 12 insertions, 1 deletions
diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk
index 0cfdb8f2ef06..ddbf9955e6d7 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_set_include,graphite,\
$(eval $(call gb_StaticLibrary_add_defs,graphite,\
-DGRAPHITE2_NTRACING \
- -DGR2_STATIC \
+ -DGRAPHITE2_STATIC \
))
ifeq ($(COM),GCC)
diff --git a/external/graphite/graphite2.win64.patch.1 b/external/graphite/graphite2.win64.patch.1
index 5d409bb4c2e0..0286126975f7 100644
--- a/external/graphite/graphite2.win64.patch.1
+++ b/external/graphite/graphite2.win64.patch.1
@@ -1,3 +1,14 @@
+diff -ur graphite.org/src/inc/Main.h graphite/src/inc/Main.h
+--- graphite.org/src/inc/Main.h 2015-09-07 20:09:25.572279671 +0700
+--- graphite/src/inc/Main.h 2015-09-07 20:09:25.572279671 +0700
+@@ -25,6 +25,7 @@
+ of the License or (at your option) any later version.
+ */
+ #pragma once
++#pragma warning(disable: 4510 4610)
+
+ #include <cstdlib>
+ #include "graphite2/Types.h"
diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h
--- graphite.org/src/inc/json.h 2015-02-03 14:49:24.408101900 +0100
+++ graphite/src/inc/json.h 2015-02-03 14:50:59.697552200 +0100