PG9.0 changes a merge module for vc2008 build.
authorHiroshi Saito <hiroshi@winpg.jp>
Thu, 23 Sep 2010 13:43:23 +0000 (13:43 +0000)
committerHiroshi Saito <hiroshi@winpg.jp>
Thu, 23 Sep 2010 13:43:23 +0000 (13:43 +0000)
installer/psqlodbc.wxs

index a392cdb1ded7f55b46bd43a0bd79d488da6c4fc9..4eea4b8d9cdaeafe486821674221f42852b0f390 100644 (file)
@@ -26,9 +26,9 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
 
-       <!-- Shared assembly runtime for VS 2005 -->
-       <Merge Id="msvcr80dll" Language="0" DiskId="1" SourceFile="$(var.PROGRAMCOM)/Microsoft_VC80_CRT_x86.msm"/>
-       <Merge Id="msvcr80policy" Language="0" DiskId="1" SourceFile="$(var.PROGRAMCOM)/policy_8_0_Microsoft_VC80_CRT_x86.msm"/>
+       <!-- Shared assembly runtime for VS 2008 -->
+       <Merge Id="msvcr90dll" Language="0" DiskId="1" SourceFile="$(var.PROGRAMCOM)/Microsoft_VC90_CRT_x86.msm"/>
+       <Merge Id="msvcr90policy" Language="0" DiskId="1" SourceFile="$(var.PROGRAMCOM)/policy_9_0_Microsoft_VC90_CRT_x86.msm"/>
 
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="BASEDIR" Name="psqlODBC">
@@ -78,8 +78,8 @@
       <Feature Id="binaries" Title="ODBC Driver" Level="1" Description="The ODBC driver and supporting libraries.">
         <ComponentRef Id="registration" />
         <MergeRef Id="psqlodbcm" />
-        <MergeRef Id="msvcr80dll" />
-        <MergeRef Id="msvcr80policy" />
+        <MergeRef Id="msvcr90dll" />
+        <MergeRef Id="msvcr90policy" />
       </Feature>
 
       <Feature Id="docs" Title="Documentation" Level="4" Description="Documentation, FAQs and HOWTOs.">