Skip to content

Commit aac5365

Browse files
committed
This CL updates src/third_party/zinnia as follows: from: taku910/zinnia@814a49b to: taku910/zinnia@581faa8 It turns out that we could not build Zinnia as a static library on Windows, which ends up with LNK2001 linker errors in Mozc. This CL addresses this issue by updating Zinnia and specifies ZINNIA_STATIC_LIBRARY. BUG=#327 TEST= REF_BUG=26887740 REF_CL=132283143 REF_TIME=2016-09-05T22:28:17-07:00 REF_TIME_RAW=1473139697 -0700
1 parent f130f24 commit aac5365

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/data/version/mozc_version_template.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
MAJOR=2
3232
MINOR=18
33-
BUILD=2609
33+
BUILD=2610
3434
REVISION=102
3535
# This version represents the version of Mozc IME engine (converter, predictor,
3636
# etc.). This version info is included both in the Mozc server and in the Mozc

src/handwriting/zinnia.gyp

+8
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@
6363
# So that dependent file can look up <zinnia.h>
6464
'<(zinnia_src_dir)',
6565
],
66+
'conditions': [
67+
['target_platform=="Windows"', {
68+
'defines': [
69+
'ZINNIA_STATIC_LIBRARY',
70+
],
71+
}],
72+
],
6673
},
6774
'cflags': [
6875
'-Wno-type-limits',
@@ -78,6 +85,7 @@
7885
'HAVE_WINDOWS_H=1',
7986
'PACKAGE="zinnia"',
8087
'VERSION="0.06"',
88+
'ZINNIA_STATIC_LIBRARY',
8189
],
8290
}],
8391
['target_platform=="Linux" or target_platform=="Mac"', {

src/third_party/zinnia

0 commit comments

Comments
 (0)