summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-21 07:57:43 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-21 07:57:43 +0000
commit9b584f0fa8fbe2ca883316eff8121c4be5e7a048 (patch)
tree8e6424428ff76d2bdfab9abbcf85cef5bb161942 /Build
parent9d2e92b7fd687b0d979e04bc440af4c787536a5c (diff)
libs/icu: Cygwin64 build fix for test program
git-svn-id: svn://tug.org/texlive/trunk@33019 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/graphite2/ChangeLog5
-rw-r--r--Build/source/libs/graphite2/Makefile.am4
-rw-r--r--Build/source/libs/graphite2/Makefile.in2
3 files changed, 8 insertions, 3 deletions
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index 18870d12e4c..7228f67a3dc 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (gr2test_CPPFLAGS): Add -DGRAPHITE2_STATIC for
+ Windows/MinGW/Cygwin.
+
2013-12-02 Peter Breitenlohner <peb@mppmu.mpg.de>
Import graphite2-1.2.4.
diff --git a/Build/source/libs/graphite2/Makefile.am b/Build/source/libs/graphite2/Makefile.am
index 233ac63dcc0..688cc2a0825 100644
--- a/Build/source/libs/graphite2/Makefile.am
+++ b/Build/source/libs/graphite2/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build graphite2 for TeX Live.
##
-## Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -131,7 +131,7 @@ gr2test_SOURCES = gr2test.c
# Force Automake to use CXXLD for linking
nodist_EXTRA_gr2test_SOURCES = dummy.cxx
-gr2test_CPPFLAGS = -Iinclude
+gr2test_CPPFLAGS = -Iinclude -DGRAPHITE2_STATIC
LDADD = libgraphite2.a
diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in
index a89232a3fe3..46ceb403806 100644
--- a/Build/source/libs/graphite2/Makefile.in
+++ b/Build/source/libs/graphite2/Makefile.in
@@ -737,7 +737,7 @@ gr2test_SOURCES = gr2test.c
# Force Automake to use CXXLD for linking
nodist_EXTRA_gr2test_SOURCES = dummy.cxx
-gr2test_CPPFLAGS = -Iinclude
+gr2test_CPPFLAGS = -Iinclude -DGRAPHITE2_STATIC
LDADD = libgraphite2.a
# Rebuild