Use Visual C++ 2015 merge modules as needed

Note that OSS Mozc has not supported installer yet. Hence this CL has no impact so far. BUG=#315 TEST= REF_BUG=24654559,25353935 REF_CL=108949027
google · Nov 30, 2015 · 22b5334 · 22b5334
1 parent 9b97b61
commit 22b5334
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2391
+BUILD=2392
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.

diff --git a/src/win32/installer/installer.gyp b/src/win32/installer/installer.gyp
@@ -78,6 +78,12 @@
               'debug_crt_merge_module_path': '<(merge_modules_dir)/Microsoft_VC120_DebugCRT_x86.msm',
               'release_crt_merge_module_path': '<(merge_modules_dir)/Microsoft_VC120_CRT_x86.msm',
             }],
+            ['use_dynamically_linked_qt==1 and compiler_target=="msvs" and compiler_target_version_int==1900', {
+              'debug_crt_merge_module_id_prefix': 'DebugCRT140',
+              'release_crt_merge_module_id_prefix': 'CRT140',
+              'debug_crt_merge_module_path': '<(merge_modules_dir)/Microsoft_VC140_DebugCRT_x86.msm',
+              'release_crt_merge_module_path': '<(merge_modules_dir)/Microsoft_VC140_CRT_x86.msm',
+            }],
             ['qt_dir and use_qt=="YES" and use_dynamically_linked_qt==1', {
               'qtcore4_dll_path': '<(qt_dir)/bin/QtCore4.dll',
               'qtcored4_dll_path': '<(qt_dir)/bin/QtCored4.dll',