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
google · Nov 27, 2015 · 9b97b61 · 9b97b61
1 parent 6555d82
commit 9b97b61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/base/port.h b/src/base/port.h
@@ -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];

diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
@@ -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"', {

diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -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.