Permalink
Browse files

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
  • Loading branch information...
1 parent 9b97b61 commit 22b5334892bf2a3b38a51bd41caad9b2b18366a5 @yukawa yukawa committed Nov 30, 2015
Showing with 7 additions and 1 deletion.
  1. +1 −1 src/mozc_version_template.txt
  2. +6 −0 src/win32/installer/installer.gyp
@@ -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.
@@ -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',

0 comments on commit 22b5334

Please sign in to comment.