include VS2010 Merge Modules.
authorHiroshi Saito <hiroshi@winpg.jp>
Tue, 28 May 2013 16:14:57 +0000 (01:14 +0900)
committerHiroshi Saito <hiroshi@winpg.jp>
Tue, 28 May 2013 16:14:57 +0000 (01:14 +0900)
installer/psqlodbc_cpu.wxs

index 5f568f5b8c543deaa6df68cf69e2b73f00d32f11..da3fec06d48d590c035b1d2363b525ce36b7ab26 100644 (file)
@@ -58,6 +58,8 @@
 <!-- Directories -->
 
     <Directory Id="TARGETDIR" Name="SourceDir">
+    <!-- Shared assembly runtime for VS 2010 -->
+     <Merge Id="msvcr100dll" Language="0" DiskId="1" SourceFile="$(var.PROGRAMCOM)/Microsoft_VC100_CRT_x64.msm"/>
       <Directory Id="$(var.PGFOLDER)" Name="PFiles">
         <Directory Id="BASEDIR" Name="psqlODBC">
           <Directory Id="SUBLOC" Name="$(var.SUBLOC)">
@@ -97,6 +99,7 @@
       <Feature Id="binaries" Title="ODBC Driver" Level="1" Description="The ODBC driver and supporting libraries.">
         <ComponentRef Id="registration" />
         <MergeRef Id="psqlodbcm" />
+   <MergeRef Id="msvcr100dll" />
       </Feature>
 
       <Feature Id="docs" Title="Documentation" Level="4" Description="Documentation and release notes.">