Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd6dd1f0

Browse files
author
Felipe "Zimmerle" Costa
committed
iis: Adding VC110 files to the Windows installer
For some reason the DLLs still demands the dependencies of theVC110 files. Providing those as part of the MSI installer
1 parent28d4f9f commitd6dd1f0

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

‎iis/installer.wxs‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,13 @@
441441
</Feature>
442442
<FeatureId="VCRedist"Title="Visual C++ 12.0 Runtime"AllowAdvertise="no"Display="hidden"Level="1">
443443
<?if $(var.Win64) ="yes" ?>
444-
<MergeRefId="VCRedist64" />
445-
<MergeRefId="VCRedist32" />
444+
<MergeRefId="VCRedist110_64" />
445+
<MergeRefId="VCRedist120_64" />
446+
<MergeRefId="VCRedist110_32" />
447+
<MergeRefId="VCRedist120_32" />
446448
<?else ?>
447-
<MergeRefId="VCRedist32" />
449+
<MergeRefId="VCRedist110_32" />
450+
<MergeRefId="VCRedist120_32" />
448451
<?endif ?>
449452
</Feature>
450453
<?if $(var.Win64) ="yes" ?>
@@ -641,10 +644,13 @@
641644
<?endif ?>
642645
<DirectoryRefId="TARGETDIR">
643646
<?if $(var.Win64) ="yes" ?>
644-
<MergeId="VCRedist64"SourceFile="wix\Microsoft_VC120_CRT_x64.msm"DiskId="1"Language="0" />
645-
<MergeId="VCRedist32"SourceFile="wix\Microsoft_VC120_CRT_x86.msm"DiskId="1"Language="0" />
647+
<MergeId="VCRedist120_64"SourceFile="wix\Microsoft_VC120_CRT_x64.msm"DiskId="1"Language="0" />
648+
<MergeId="VCRedist110_64"SourceFile="wix\Microsoft_VC110_CRT_x64.msm"DiskId="1"Language="0" />
649+
<MergeId="VCRedist120_32"SourceFile="wix\Microsoft_VC120_CRT_x86.msm"DiskId="1"Language="0" />
650+
<MergeId="VCRedist110_32"SourceFile="wix\Microsoft_VC110_CRT_x86.msm"DiskId="1"Language="0" />
646651
<?else ?>
647-
<MergeId="VCRedist32"SourceFile="wix\Microsoft_VC120_CRT_x86.msm"DiskId="1"Language="0" />
652+
<MergeId="VCRedist120_32"SourceFile="wix\Microsoft_VC120_CRT_x86.msm"DiskId="1"Language="0" />
653+
<MergeId="VCRedist110_32"SourceFile="wix\Microsoft_VC110_CRT_x86.msm"DiskId="1"Language="0" />
648654
<?endif ?>
649655
</DirectoryRef>
650656
</Product>
728 KB
Binary file not shown.
748 KB
Binary file not shown.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp