Changeset 2413


Ignore:
Timestamp:
3/8/2012 12:51:07 PM (3 years ago)
Author:
lowjoel
Message:

We should link with the VC2010 merge modules for the C++ Runtime, since we are compiling using VS2010 for 6.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser/Installer/DirectoryStructure.wxs

    r2122 r2413  
    2727                <!-- Dependencies (of Eraser.Shell.Dll) --> 
    2828                <?if $(sys.BUILDARCH) = "x64"?> 
    29                     <Merge Id="VCRedist" SourceFile="Merge Modules\Microsoft_VC90_CRT_x86_x64.msm" 
    30                         DiskId="1" Language="0"/> 
    31                     <Merge Id="VCAtlRedist" SourceFile="Merge Modules\Microsoft_VC90_ATL_x86_x64.msm" 
    32                         DiskId="1" Language="0"/> 
    33                     <Merge Id="VCMfcRedist" SourceFile="Merge Modules\Microsoft_VC90_MFC_x86_x64.msm" 
     29                    <Merge Id="VCRedist" SourceFile="Merge Modules\Microsoft_VC100_CRT_x86_x64.msm" 
     30                        DiskId="1" Language="0"/> 
     31                    <Merge Id="VCAtlRedist" SourceFile="Merge Modules\Microsoft_VC100_ATL_x86_x64.msm" 
     32                        DiskId="1" Language="0"/> 
     33                    <Merge Id="VCMfcRedist" SourceFile="Merge Modules\Microsoft_VC100_MFC_x86_x64.msm" 
    3434                        DiskId="1" Language="0"/> 
    3535                <?else?> 
    36                     <Merge Id="VCRedist" SourceFile="Merge Modules\Microsoft_VC90_CRT_x86.msm" 
    37                         DiskId="1" Language="0"/> 
    38                     <Merge Id="VCAtlRedist" SourceFile="Merge Modules\Microsoft_VC90_ATL_x86.msm" 
    39                         DiskId="1" Language="0"/> 
    40                     <Merge Id="VCMfcRedist" SourceFile="Merge Modules\Microsoft_VC90_MFC_x86.msm" 
     36                    <Merge Id="VCRedist" SourceFile="Merge Modules\Microsoft_VC100_CRT_x86.msm" 
     37                        DiskId="1" Language="0"/> 
     38                    <Merge Id="VCAtlRedist" SourceFile="Merge Modules\Microsoft_VC100_ATL_x86.msm" 
     39                        DiskId="1" Language="0"/> 
     40                    <Merge Id="VCMfcRedist" SourceFile="Merge Modules\Microsoft_VC100_MFC_x86.msm" 
    4141                        DiskId="1" Language="0"/> 
    4242                <?endif?> 
Note: See TracChangeset for help on using the changeset viewer.