Permalink
Browse files

Support building Mozc with Visual C++ 2015

With this CL,
  build_mozc.py gyp --msvs_version=2015
should start working.

BUG=#315
TEST=
REF_BUG=24654559
REF_CL=108838384
  • Loading branch information...
1 parent 6555d82 commit 9b97b61a11c66c63f85e4d1221ba617db375a261 @yukawa yukawa committed Nov 27, 2015
Showing with 9 additions and 3 deletions.
  1. +2 −2 src/base/port.h
  2. +6 −0 src/gyp/common.gypi
  3. +1 −1 src/mozc_version_template.txt
View
@@ -85,9 +85,9 @@ typedef long long int64;
#include <stdint.h>
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf_s
-#endif // _MSC_VER
+#endif // _MSC_VER < 1900
template <typename T, size_t N>
char (&ArraySizeHelper(T (&array)[N]))[N];
View
@@ -132,6 +132,12 @@
'compiler_host': 'msvs',
'compiler_host_version_int': 1800, # Visual C++ 2013 or higher
}],
+ ['MSVS_VERSION=="2015"', {
+ 'compiler_target': 'msvs',
+ 'compiler_target_version_int': 1900, # Visual C++ 2015 or higher
+ 'compiler_host': 'msvs',
+ 'compiler_host_version_int': 1900, # Visual C++ 2015 or higher
+ }],
],
}],
['OS=="mac"', {
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=17
-BUILD=2390
+BUILD=2391
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.

0 comments on commit 9b97b61

Please sign in to comment.