walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Windows Installer: Update merge module file name (path incorrect, files need to be copied from its new, strange location to "C:/Program Files (x86)/Common Files/Merge Modules")

This commit is contained in:
PKEuS 2017-07-29 12:11:58 +02:00
parent 57bd6aafd5
commit b54bed4a0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
win_installer/config.wxi
View File

@ -9,10 +9,10 @@
<?define QtDllDir = "..\bin" ?> <?define QtDllDir = "..\bin" ?>
<?if $(var.Platform) = x64 ?> <?if $(var.Platform) = x64 ?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_x64.msm" ?> <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC150_CRT_x64.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?> <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?else?> <?else?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_x86.msm" ?> <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC150_CRT_x86.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?endif?> <?endif?>
</Include> </Include>