Pull taku910/zinnia@581faa8f6f15e4a7b21964be3a5ec36265c80e5b
This CL updates src/third_party/zinnia as follows:
from: taku910/zinnia@814a49b031709b34d23898bce47f08dc1b554ec8
to: taku910/zinnia@581faa8f6f15e4a7b21964be3a5ec36265c80e5b
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
Yohei Yukawa
7 years ago
| 29 | 29 |
|
| 30 | 30 |
MAJOR=2
|
| 31 | 31 |
MINOR=18
|
| 32 | |
BUILD=2609
|
|
32 |
BUILD=2610
|
| 33 | 33 |
REVISION=102
|
| 34 | 34 |
# This version represents the version of Mozc IME engine (converter, predictor,
|
| 35 | 35 |
# etc.). This version info is included both in the Mozc server and in the Mozc
|
| 62 | 62 |
# So that dependent file can look up <zinnia.h>
|
| 63 | 63 |
'<(zinnia_src_dir)',
|
| 64 | 64 |
],
|
|
65 |
'conditions': [
|
|
66 |
['target_platform=="Windows"', {
|
|
67 |
'defines': [
|
|
68 |
'ZINNIA_STATIC_LIBRARY',
|
|
69 |
],
|
|
70 |
}],
|
|
71 |
],
|
| 65 | 72 |
},
|
| 66 | 73 |
'cflags': [
|
| 67 | 74 |
'-Wno-type-limits',
|
|
| 77 | 84 |
'HAVE_WINDOWS_H=1',
|
| 78 | 85 |
'PACKAGE="zinnia"',
|
| 79 | 86 |
'VERSION="0.06"',
|
|
87 |
'ZINNIA_STATIC_LIBRARY',
|
| 80 | 88 |
],
|
| 81 | 89 |
}],
|
| 82 | 90 |
['target_platform=="Linux" or target_platform=="Mac"', {
|