Use PostgreSQL 8.2 libs & headers by default.

Write the version number to the registry when installing on Windows.
Don't use deprecated compiler flags when building with > VC++ 6.0

diff --git a/installer/psqlodbc.wxs b/installer/psqlodbc.wxs
index f2f5649d79b05c73acb7ad1868ba2da11d055881..4c19075df53b5e6a61b4ac895b3bf4e15418e99d 100644 (file)
--- a/installer/psqlodbc.wxs
+++ b/installer/psqlodbc.wxs
@@ -29,6 +29,9 @@
         <Directory Id="BASEDIR" Name="psqlODBC">
           <Directory Id="SUBLOC" Name="$(var.SUBLOC)">
             <Directory Id="BINDIR" Name="bin">
+              <Component Id="registration" Guid="4F0C04EB-ADCB-4fa8-B6A3-E9F74EA693F8">
+                <RegistryValue KeyPath="yes" Type="string" Root="HKCU" Key="Software\psqlODBC\Version" Value="$(var.VERSION)" />
+              </Component>
               <Merge Id="psqlodbcm" DiskId="1" Language="1033" src="psqlodbc.msm" />
             </Directory>
             <Directory Id="DOCSDIR" Name="docs">
@@ -62,6 +65,7 @@
 
     <Feature Id="psqlodbc" Title="psqlODBC" Level="1" Description="psqlODBC - The PostgreSQL ODBC Driver" ConfigurableDirectory="BASEDIR" Display="expand">
       <Feature Id="binaries" Title="ODBC Driver" Level="1" Description="The ODBC driver and supporting libraries.">
+        <ComponentRef Id="registration" />
         <MergeRef Id="psqlodbcm" />
       </Feature>
       

diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index b08d945a3fe33dc41464e6617cc741375c52dfef..acc88e74379e8e4a417d4d47948432e5d65368e1 100644 (file)
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -25,19 +25,19 @@
           <File Id="psqlodbc30a.dll" LongName="psqlodbc30a.dll" Name="psqlodxA.dll" src="../MultibyteRelease/psqlodbc30a.dll" />
           <File Id="psqlodbc35w.dll" LongName="psqlodbc35w.dll" Name="psqlodxW.dll" src="../Release/psqlodbc35w.dll" />
           <File Id="pgxalib.dll" LongName="pgxalib.dll" Name="pgxalib.dll" src="../Release/pgxalib.dll" />
-          <File Id="libpq.dll" Name="libpq.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libpq.dll" KeyPath="yes" />
+          <File Id="libpq.dll" Name="libpq.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libpq.dll" KeyPath="yes" />
           
           <!-- Gettext -->
-          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libintl-2.dll" />
-          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libiconv-2.dll" />
+          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libintl-2.dll" />
+          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libiconv-2.dll" />
           
           <!-- SSL -->
-          <File Id="libeay32.dll" Name="libeay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libeay32.dll" />
-          <File Id="ssleay32.dll" Name="ssleay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\ssleay32.dll" />
+          <File Id="libeay32.dll" Name="libeay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libeay32.dll" />
+          <File Id="ssleay32.dll" Name="ssleay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\ssleay32.dll" />
  
           <!-- MIT Kerberos -->
-          <File Id="comerr32.dll" Name="comerr32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\comerr32.dll" />
-          <File Id="krb5_32.dll" Name="krb5_32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\krb5_32.dll" />
+          <File Id="comerr32.dll" Name="comerr32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\comerr32.dll" />
+          <File Id="krb5_32.dll" Name="krb5_32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\krb5_32.dll" />
           
           <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
           <!--       so we install the registry keys manually ourselves.                         -->

diff --git a/psqlodbc.vcproj b/psqlodbc.vcproj
index 0c00283e4968fbda30dceeeec65d897bca165a1c..5ae957b390fd3990414a1a24d0ff16f89c9480ae 100644 (file)
--- a/psqlodbc.vcproj
+++ b/psqlodbc.vcproj
@@ -1,1126 +1,1126 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<VisualStudioProject\r
-   ProjectType="Visual C++"\r
-   Version="8.00"\r
-   Name="psqlODBC"\r
-   ProjectGUID="{030F0B3C-E4D3-4EE4-B3F5-B6408B198899}"\r
-   >\r
-   <Platforms>\r
-       <Platform\r
-           Name="Win32"\r
-       />\r
-   </Platforms>\r
-   <ToolFiles>\r
-   </ToolFiles>\r
-   <Configurations>\r
-       <Configuration\r
-           Name="Release|Win32"\r
-           OutputDirectory=".\Release"\r
-           IntermediateDirectory=".\Release"\r
-           ConfigurationType="2"\r
-           InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
-           UseOfMFC="0"\r
-           ATLMinimizesCRunTimeLibraryUsage="false"\r
-           CharacterSet="2"\r
-           >\r
-           <Tool\r
-               Name="VCPreBuildEventTool"\r
-           />\r
-           <Tool\r
-               Name="VCCustomBuildTool"\r
-           />\r
-           <Tool\r
-               Name="VCXMLDataGeneratorTool"\r
-           />\r
-           <Tool\r
-               Name="VCWebServiceProxyGeneratorTool"\r
-           />\r
-           <Tool\r
-               Name="VCMIDLTool"\r
-               TypeLibraryName=".\Release/psqlodbc.tlb"\r
-               HeaderFileName=""\r
-           />\r
-           <Tool\r
-               Name="VCCLCompilerTool"\r
-               Optimization="2"\r
-               InlineFunctionExpansion="1"\r
-               AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.1\include&quot;;C:\OpenSSL\include"\r
-               PreprocessorDefinitions="NDEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE"\r
-               StringPooling="true"\r
-               RuntimeLibrary="2"\r
-               EnableFunctionLevelLinking="true"\r
-               PrecompiledHeaderFile="$(IntDir)\psqlodbc.pch"\r
-               AssemblerListingLocation="$(IntDir)\"\r
-               ObjectFile="$(IntDir)\"\r
-               ProgramDataBaseFileName="$(IntDir)\"\r
-               BrowseInformationFile=""\r
-               WarningLevel="3"\r
-               SuppressStartupBanner="true"\r
-           />\r
-           <Tool\r
-               Name="VCManagedResourceCompilerTool"\r
-           />\r
-           <Tool\r
-               Name="VCResourceCompilerTool"\r
-               PreprocessorDefinitions="NDEBUG"\r
-               Culture="1041"\r
-               AdditionalIncludeDirectories=".;japanese"\r
-           />\r
-           <Tool\r
-               Name="VCPreLinkEventTool"\r
-           />\r
-           <Tool\r
-               Name="VCLinkerTool"\r
-               AdditionalDependencies="user32.lib ADVAPI32.lib gdi32.lib wsock32.lib shfolder.lib odbc32.lib odbccp32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"\r
-               OutputFile="$(OutDir)\psqlodbc35w.dll"\r
-               LinkIncremental="1"\r
-               SuppressStartupBanner="true"\r
-               AdditionalLibraryDirectories="C:\OpenSSL\lib\VC;&quot;C:\Program Files\PostgreSQL\8.1\lib\ms&quot;"\r
-               GenerateManifest="true"\r
-               ModuleDefinitionFile=".\psqlodbc.def"\r
-               ProgramDatabaseFile="$(TargetDir)\psqlodbc35w.pdb"\r
-               SubSystem="2"\r
-               ImportLibrary="$(OutDir)\psqlodbc35w.lib"\r
-               TargetMachine="1"\r
-           />\r
-           <Tool\r
-               Name="VCALinkTool"\r
-           />\r
-           <Tool\r
-               Name="VCManifestTool"\r
-           />\r
-           <Tool\r
-               Name="VCXDCMakeTool"\r
-           />\r
-           <Tool\r
-               Name="VCBscMakeTool"\r
-               SuppressStartupBanner="true"\r
-               OutputFile=".\Release/psqlodbc.bsc"\r
-           />\r
-           <Tool\r
-               Name="VCFxCopTool"\r
-           />\r
-           <Tool\r
-               Name="VCAppVerifierTool"\r
-           />\r
-           <Tool\r
-               Name="VCWebDeploymentTool"\r
-           />\r
-           <Tool\r
-               Name="VCPostBuildEventTool"\r
-           />\r
-       </Configuration>\r
-       <Configuration\r
-           Name="Debug|Win32"\r
-           OutputDirectory=".\Debug"\r
-           IntermediateDirectory=".\Debug"\r
-           ConfigurationType="2"\r
-           InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
-           UseOfMFC="0"\r
-           ATLMinimizesCRunTimeLibraryUsage="false"\r
-           CharacterSet="2"\r
-           >\r
-           <Tool\r
-               Name="VCPreBuildEventTool"\r
-           />\r
-           <Tool\r
-               Name="VCCustomBuildTool"\r
-           />\r
-           <Tool\r
-               Name="VCXMLDataGeneratorTool"\r
-           />\r
-           <Tool\r
-               Name="VCWebServiceProxyGeneratorTool"\r
-           />\r
-           <Tool\r
-               Name="VCMIDLTool"\r
-               TypeLibraryName=".\Debug/psqlodbc.tlb"\r
-               HeaderFileName=""\r
-           />\r
-           <Tool\r
-               Name="VCCLCompilerTool"\r
-               Optimization="4"\r
-               AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.1\include&quot;;C:\OpenSSL\include"\r
-               PreprocessorDefinitions="_DEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE"\r
-               MinimalRebuild="true"\r
-               BasicRuntimeChecks="3"\r
-               RuntimeLibrary="2"\r
-               PrecompiledHeaderFile="$(IntDir)\psqlodbc.pch"\r
-               AssemblerListingLocation="$(IntDir)\"\r
-               ObjectFile="$(IntDir)\"\r
-               ProgramDataBaseFileName="$(IntDir)\"\r
-               BrowseInformation="1"\r
-               WarningLevel="3"\r
-               SuppressStartupBanner="true"\r
-               DebugInformationFormat="4"\r
-           />\r
-           <Tool\r
-               Name="VCManagedResourceCompilerTool"\r
-           />\r
-           <Tool\r
-               Name="VCResourceCompilerTool"\r
-               PreprocessorDefinitions="_DEBUG"\r
-               Culture="1041"\r
-               AdditionalIncludeDirectories=".;japanese"\r
-           />\r
-           <Tool\r
-               Name="VCPreLinkEventTool"\r
-           />\r
-           <Tool\r
-               Name="VCLinkerTool"\r
-               AdditionalDependencies="user32.lib ADVAPI32.lib gdi32.lib wsock32.lib shfolder.lib odbc32.lib odbccp32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"\r
-               OutputFile="$(OutDir)\psqlodbc35w.dll"\r
-               LinkIncremental="2"\r
-               SuppressStartupBanner="true"\r
-               AdditionalLibraryDirectories="C:\OpenSSL\lib\VC;&quot;C:\Program Files\PostgreSQL\8.1\lib\ms&quot;"\r
-               ModuleDefinitionFile=".\psqlodbc.def"\r
-               GenerateDebugInformation="true"\r
-               ProgramDatabaseFile="$(TargetDir)\psqlodbc35w.pdb"\r
-               SubSystem="2"\r
-               ImportLibrary="$(OutDir)\psqlodbc35w.lib"\r
-               TargetMachine="1"\r
-           />\r
-           <Tool\r
-               Name="VCALinkTool"\r
-           />\r
-           <Tool\r
-               Name="VCManifestTool"\r
-           />\r
-           <Tool\r
-               Name="VCXDCMakeTool"\r
-           />\r
-           <Tool\r
-               Name="VCBscMakeTool"\r
-               SuppressStartupBanner="true"\r
-               OutputFile=".\Debug/psqlodbc.bsc"\r
-           />\r
-           <Tool\r
-               Name="VCFxCopTool"\r
-           />\r
-           <Tool\r
-               Name="VCAppVerifierTool"\r
-           />\r
-           <Tool\r
-               Name="VCWebDeploymentTool"\r
-           />\r
-           <Tool\r
-               Name="VCPostBuildEventTool"\r
-           />\r
-       </Configuration>\r
-   </Configurations>\r
-   <References>\r
-   </References>\r
-   <Files>\r
-       <Filter\r
-           Name="source"\r
-           Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-           >\r
-           <File\r
-               RelativePath="bind.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="columninfo.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="connection.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="convert.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="descriptor.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="dlg_specific.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="dlg_wingui.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="drvconn.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="environ.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="execute.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="info.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="info30.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="inouealc.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="loadlib.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="lobj.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="misc.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="multibyte.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="mylog.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="odbcapi.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="odbcapi30.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="odbcapi30w.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="odbcapiw.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="options.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="parse.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="pgapi30.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="pgtypes.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="psqlodbc.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="qresult.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="results.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="setup.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="socket.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="statement.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="tuple.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="win_md5.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="win_unicode.c"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCCLCompilerTool"\r
-                       AdditionalIncludeDirectories=""\r
-                       PreprocessorDefinitions=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-       </Filter>\r
-       <Filter\r
-           Name="include"\r
-           >\r
-           <File\r
-               RelativePath="bind.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="columninfo.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="connection.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="convert.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="descriptor.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="dlg_specific.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="environ.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="iodbc.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="isql.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="isqlext.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="loadlib.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="lobj.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="md5.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="misc.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="multibyte.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="pgapifunc.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="pgtypes.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="psqlodbc.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="qresult.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="socket.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="statement.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="tuple.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="tuplelist.h"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="win_setup.h"\r
-               >\r
-           </File>\r
-       </Filter>\r
-       <Filter\r
-           Name="resource"\r
-           >\r
-           <File\r
-               RelativePath="psqlodbc.def"\r
-               >\r
-           </File>\r
-           <File\r
-               RelativePath="psqlodbc.rc"\r
-               >\r
-               <FileConfiguration\r
-                   Name="Release|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCResourceCompilerTool"\r
-                       PreprocessorDefinitions=""\r
-                       AdditionalIncludeDirectories=""\r
-                   />\r
-               </FileConfiguration>\r
-               <FileConfiguration\r
-                   Name="Debug|Win32"\r
-                   >\r
-                   <Tool\r
-                       Name="VCResourceCompilerTool"\r
-                       PreprocessorDefinitions=""\r
-                       AdditionalIncludeDirectories=""\r
-                   />\r
-               </FileConfiguration>\r
-           </File>\r
-           <File\r
-               RelativePath="resource.h"\r
-               >\r
-           </File>\r
-       </Filter>\r
-   </Files>\r
-   <Globals>\r
-   </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+   ProjectType="Visual C++"
+   Version="8.00"
+   Name="psqlODBC"
+   ProjectGUID="{030F0B3C-E4D3-4EE4-B3F5-B6408B198899}"
+   >
+   <Platforms>
+       <Platform
+           Name="Win32"
+       />
+   </Platforms>
+   <ToolFiles>
+   </ToolFiles>
+   <Configurations>
+       <Configuration
+           Name="Release|Win32"
+           OutputDirectory=".\Release"
+           IntermediateDirectory=".\Release"
+           ConfigurationType="2"
+           InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+           UseOfMFC="0"
+           ATLMinimizesCRunTimeLibraryUsage="false"
+           CharacterSet="2"
+           >
+           <Tool
+               Name="VCPreBuildEventTool"
+           />
+           <Tool
+               Name="VCCustomBuildTool"
+           />
+           <Tool
+               Name="VCXMLDataGeneratorTool"
+           />
+           <Tool
+               Name="VCWebServiceProxyGeneratorTool"
+           />
+           <Tool
+               Name="VCMIDLTool"
+               TypeLibraryName=".\Release/psqlodbc.tlb"
+               HeaderFileName=""
+           />
+           <Tool
+               Name="VCCLCompilerTool"
+               Optimization="2"
+               InlineFunctionExpansion="1"
+               AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.2\include&quot;;C:\OpenSSL\include"
+               PreprocessorDefinitions="NDEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE"
+               StringPooling="true"
+               RuntimeLibrary="2"
+               EnableFunctionLevelLinking="true"
+               PrecompiledHeaderFile="$(IntDir)\psqlodbc.pch"
+               AssemblerListingLocation="$(IntDir)\"
+               ObjectFile="$(IntDir)\"
+               ProgramDataBaseFileName="$(IntDir)\"
+               BrowseInformationFile=""
+               WarningLevel="3"
+               SuppressStartupBanner="true"
+           />
+           <Tool
+               Name="VCManagedResourceCompilerTool"
+           />
+           <Tool
+               Name="VCResourceCompilerTool"
+               PreprocessorDefinitions="NDEBUG"
+               Culture="1041"
+               AdditionalIncludeDirectories=".;japanese"
+           />
+           <Tool
+               Name="VCPreLinkEventTool"
+           />
+           <Tool
+               Name="VCLinkerTool"
+               AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib XOleHlp.lib winmm.lib"
+               OutputFile="$(OutDir)\psqlodbc35w.dll"
+               LinkIncremental="1"
+               SuppressStartupBanner="true"
+               AdditionalLibraryDirectories="C:\OpenSSL\lib\VC;&quot;C:\Program Files\PostgreSQL\8.2\lib\ms&quot;"
+               GenerateManifest="true"
+               ModuleDefinitionFile=".\psqlodbc.def"
+               ProgramDatabaseFile="$(TargetDir)\psqlodbc35w.pdb"
+               SubSystem="2"
+               ImportLibrary="$(OutDir)\psqlodbc35w.lib"
+               TargetMachine="1"
+           />
+           <Tool
+               Name="VCALinkTool"
+           />
+           <Tool
+               Name="VCManifestTool"
+           />
+           <Tool
+               Name="VCXDCMakeTool"
+           />
+           <Tool
+               Name="VCBscMakeTool"
+               SuppressStartupBanner="true"
+               OutputFile=".\Release/psqlodbc.bsc"
+           />
+           <Tool
+               Name="VCFxCopTool"
+           />
+           <Tool
+               Name="VCAppVerifierTool"
+           />
+           <Tool
+               Name="VCWebDeploymentTool"
+           />
+           <Tool
+               Name="VCPostBuildEventTool"
+           />
+       </Configuration>
+       <Configuration
+           Name="Debug|Win32"
+           OutputDirectory=".\Debug"
+           IntermediateDirectory=".\Debug"
+           ConfigurationType="2"
+           InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+           UseOfMFC="0"
+           ATLMinimizesCRunTimeLibraryUsage="false"
+           CharacterSet="2"
+           >
+           <Tool
+               Name="VCPreBuildEventTool"
+           />
+           <Tool
+               Name="VCCustomBuildTool"
+           />
+           <Tool
+               Name="VCXMLDataGeneratorTool"
+           />
+           <Tool
+               Name="VCWebServiceProxyGeneratorTool"
+           />
+           <Tool
+               Name="VCMIDLTool"
+               TypeLibraryName=".\Debug/psqlodbc.tlb"
+               HeaderFileName=""
+           />
+           <Tool
+               Name="VCCLCompilerTool"
+               Optimization="4"
+               AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.2\include&quot;;C:\OpenSSL\include"
+               PreprocessorDefinitions="_DEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE"
+               MinimalRebuild="true"
+               BasicRuntimeChecks="3"
+               RuntimeLibrary="2"
+               PrecompiledHeaderFile="$(IntDir)\psqlodbc.pch"
+               AssemblerListingLocation="$(IntDir)\"
+               ObjectFile="$(IntDir)\"
+               ProgramDataBaseFileName="$(IntDir)\"
+               BrowseInformation="1"
+               WarningLevel="3"
+               SuppressStartupBanner="true"
+               DebugInformationFormat="4"
+           />
+           <Tool
+               Name="VCManagedResourceCompilerTool"
+           />
+           <Tool
+               Name="VCResourceCompilerTool"
+               PreprocessorDefinitions="_DEBUG"
+               Culture="1041"
+               AdditionalIncludeDirectories=".;japanese"
+           />
+           <Tool
+               Name="VCPreLinkEventTool"
+           />
+           <Tool
+               Name="VCLinkerTool"
+               AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib XOleHlp.lib winmm.lib"
+               OutputFile="$(OutDir)\psqlodbc35w.dll"
+               LinkIncremental="2"
+               SuppressStartupBanner="true"
+               AdditionalLibraryDirectories="C:\OpenSSL\lib\VC;&quot;C:\Program Files\PostgreSQL\8.2\lib\ms&quot;"
+               ModuleDefinitionFile=".\psqlodbc.def"
+               GenerateDebugInformation="true"
+               ProgramDatabaseFile="$(TargetDir)\psqlodbc35w.pdb"
+               SubSystem="2"
+               ImportLibrary="$(OutDir)\psqlodbc35w.lib"
+               TargetMachine="1"
+           />
+           <Tool
+               Name="VCALinkTool"
+           />
+           <Tool
+               Name="VCManifestTool"
+           />
+           <Tool
+               Name="VCXDCMakeTool"
+           />
+           <Tool
+               Name="VCBscMakeTool"
+               SuppressStartupBanner="true"
+               OutputFile=".\Debug/psqlodbc.bsc"
+           />
+           <Tool
+               Name="VCFxCopTool"
+           />
+           <Tool
+               Name="VCAppVerifierTool"
+           />
+           <Tool
+               Name="VCWebDeploymentTool"
+           />
+           <Tool
+               Name="VCPostBuildEventTool"
+           />
+       </Configuration>
+   </Configurations>
+   <References>
+   </References>
+   <Files>
+       <Filter
+           Name="source"
+           Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+           >
+           <File
+               RelativePath="bind.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="columninfo.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="connection.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="convert.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="descriptor.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="dlg_specific.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="dlg_wingui.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="drvconn.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="environ.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="execute.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="info.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="info30.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="inouealc.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="loadlib.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="lobj.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="misc.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="multibyte.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="mylog.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="odbcapi.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="odbcapi30.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="odbcapi30w.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="odbcapiw.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="options.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="parse.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="pgapi30.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="pgtypes.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="psqlodbc.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="qresult.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="results.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="setup.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="socket.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="statement.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="tuple.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="win_md5.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="win_unicode.c"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCCLCompilerTool"
+                       AdditionalIncludeDirectories=""
+                       PreprocessorDefinitions=""
+                   />
+               </FileConfiguration>
+           </File>
+       </Filter>
+       <Filter
+           Name="include"
+           >
+           <File
+               RelativePath="bind.h"
+               >
+           </File>
+           <File
+               RelativePath="columninfo.h"
+               >
+           </File>
+           <File
+               RelativePath="connection.h"
+               >
+           </File>
+           <File
+               RelativePath="convert.h"
+               >
+           </File>
+           <File
+               RelativePath="descriptor.h"
+               >
+           </File>
+           <File
+               RelativePath="dlg_specific.h"
+               >
+           </File>
+           <File
+               RelativePath="environ.h"
+               >
+           </File>
+           <File
+               RelativePath="iodbc.h"
+               >
+           </File>
+           <File
+               RelativePath="isql.h"
+               >
+           </File>
+           <File
+               RelativePath="isqlext.h"
+               >
+           </File>
+           <File
+               RelativePath="loadlib.h"
+               >
+           </File>
+           <File
+               RelativePath="lobj.h"
+               >
+           </File>
+           <File
+               RelativePath="md5.h"
+               >
+           </File>
+           <File
+               RelativePath="misc.h"
+               >
+           </File>
+           <File
+               RelativePath="multibyte.h"
+               >
+           </File>
+           <File
+               RelativePath="pgapifunc.h"
+               >
+           </File>
+           <File
+               RelativePath="pgtypes.h"
+               >
+           </File>
+           <File
+               RelativePath="psqlodbc.h"
+               >
+           </File>
+           <File
+               RelativePath="qresult.h"
+               >
+           </File>
+           <File
+               RelativePath="socket.h"
+               >
+           </File>
+           <File
+               RelativePath="statement.h"
+               >
+           </File>
+           <File
+               RelativePath="tuple.h"
+               >
+           </File>
+           <File
+               RelativePath="tuplelist.h"
+               >
+           </File>
+           <File
+               RelativePath="win_setup.h"
+               >
+           </File>
+       </Filter>
+       <Filter
+           Name="resource"
+           >
+           <File
+               RelativePath="psqlodbc.def"
+               >
+           </File>
+           <File
+               RelativePath="psqlodbc.rc"
+               >
+               <FileConfiguration
+                   Name="Release|Win32"
+                   >
+                   <Tool
+                       Name="VCResourceCompilerTool"
+                       PreprocessorDefinitions=""
+                       AdditionalIncludeDirectories=""
+                   />
+               </FileConfiguration>
+               <FileConfiguration
+                   Name="Debug|Win32"
+                   >
+                   <Tool
+                       Name="VCResourceCompilerTool"
+                       PreprocessorDefinitions=""
+                       AdditionalIncludeDirectories=""
+                   />
+               </FileConfiguration>
+           </File>
+           <File
+               RelativePath="resource.h"
+               >
+           </File>
+       </Filter>
+   </Files>
+   <Globals>
+   </Globals>
+</VisualStudioProject>

diff --git a/win32.mak b/win32.mak
index 04921169018fdd02493bfe9a1c030ddbadd78c22..e44a2732539ef039b66fb06b6b2aa20d42e9b029 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -40,12 +40,12 @@ CFG=Release
 #
 #
 !IF "$(PG_INC)" == ""
-PG_INC=$(PROGRAMFILES)\PostgreSQL\8.1\include
+PG_INC=$(PROGRAMFILES)\PostgreSQL\8.2\include
 !MESSAGE Using default PostgreSQL Include directory: $(PG_INC)
 !ENDIF
 
 !IF "$(PG_LIB)" == ""
-PG_LIB=$(PROGRAMFILES)\PostgreSQL\8.1\lib\ms
+PG_LIB=$(PROGRAMFILES)\PostgreSQL\8.2\lib\ms
 !MESSAGE Using default PostgreSQL Library directory: $(PG_LIB)
 !ENDIF
 
@@ -75,9 +75,11 @@ ADD_DEFINES = $(ADD_DEFINES) /D "SSL_DLL=\"$(SSL_DLL)\""
 MSVC_VERSION=vc60
 VC07_DELAY_LOAD=
 MSDTC=no
+VC_FLAGS=/GX /YX
 !ELSE
 MSVC_VERSION=vc70
 VC07_DELAY_LOAD="/DelayLoad:libpq.dll /DelayLoad:$(SSL_DLL) /DelayLoad:XOLEHLP.dll /DELAY:UNLOAD"
+VC_FLAGS=/EHsc
 !ENDIF
 ADD_DEFINES = $(ADD_DEFINES) /D "DYNAMIC_LOAD"
 
@@ -161,9 +163,9 @@ $(INTDIR)\connection.obj $(INTDIR)\psqlodbc.res: version.h
 
 CPP=cl.exe
 !IF  "$(CFG)" == "Release"
-CPP_PROJ=/nologo /$(LINKMT) /W3 /GX /O2 /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /$(LINKMT) /W3 $(VC_FLAGS) /O2 /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 !ELSEIF  "$(CFG)" == "Debug"
-CPP_PROJ=/nologo /$(LINKMT)d /W3 /Gm /GX /ZI /Od /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /$(LINKMT)d /W3 /Gm $(VC_FLAGS) /ZI /Od /I "$(PG_INC)" /I "$(SSL_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
 !ENDIF
 
 .c{$(INTDIR)}.obj::