From 9b584f0fa8fbe2ca883316eff8121c4be5e7a048 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 21 Feb 2014 07:57:43 +0000 Subject: libs/icu: Cygwin64 build fix for test program git-svn-id: svn://tug.org/texlive/trunk@33019 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/graphite2/ChangeLog | 5 +++++ Build/source/libs/graphite2/Makefile.am | 4 ++-- Build/source/libs/graphite2/Makefile.in | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'Build/source/libs/graphite2') 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 + + * Makefile.am (gr2test_CPPFLAGS): Add -DGRAPHITE2_STATIC for + Windows/MinGW/Cygwin. + 2013-12-02 Peter Breitenlohner 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 +## Copyright (C) 2012-2014 Peter Breitenlohner ## ## 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 -- cgit v1.2.3