From 3e00ae6f0555d2d5f944800ccae6ecfd3f94f6f8 Mon Sep 17 00:00:00 2001
From: Hiroshi Saito <hiroshi@winpg.jp>
Date: Mon, 21 Jan 2008 02:09:03 +0000
Subject: [PATCH] Fix problem of CRLF code.

---
 psqlodbc.vcproj | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/psqlodbc.vcproj b/psqlodbc.vcproj
index 61aeaef..2045c46 100644
--- a/psqlodbc.vcproj
+++ b/psqlodbc.vcproj
@@ -18,7 +18,6 @@
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -45,7 +44,7 @@
 				AdditionalOptions="/D SSL_DLL=&quot;\&quot;SSLEAY32.dll\&quot;&quot;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="C:\Program Files\PostgreSQL\8.2\include,C:\OpenSSL\include"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.2\include&quot;;&quot;C:\OpenSSL\include&quot;"
 				PreprocessorDefinitions="NDEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;DYNAMIC_LOAD;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE;USE_SSPI"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -71,17 +70,14 @@
 			/>
 			<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 winmm.lib libpq.lib ssleay32.li
-b libeay32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib XOleHlp.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"
 				OutputFile="psqlodbc35w.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="C:\Program Files\PostgreSQL\8.2\lib\ms,C:\OpenSSL\lib\VC"
-				IgnoreAllDefaultLibraries="true"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\PostgreSQL\8.2\lib\ms&quot;;&quot;C:\OpenSSL\lib\VC&quot;"
+				IgnoreAllDefaultLibraries="false"
 				ModuleDefinitionFile=".\psqlodbc.def"
-				DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll"
+				DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL"
 				ProgramDatabaseFile="psqlodbc35w.pdb"
 				SubSystem="2"
 				ImportLibrary="psqlodbc35w.lib"
@@ -119,7 +115,6 @@ b libeay32.lib"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -146,7 +141,7 @@ b libeay32.lib"
 				AdditionalOptions="/D SSL_DLL=&quot;\&quot;SSLEAY32.dll\&quot;&quot;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="C:\Program Files\PostgreSQL\8.2\include,C:\OpenSSL\include"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.2\include&quot;;&quot;C:\OpenSSL\include&quot;"
 				PreprocessorDefinitions="_DEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;DYNAMIC_LOAD;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE;USE_SSPI"
 				StringPooling="true"
 				RuntimeLibrary="1"
@@ -173,16 +168,14 @@ b libeay32.lib"
 			/>
 			<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 winmm.lib libpq.lib ssleay32.li
-b libeay32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib XOleHlp.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"
 				OutputFile="psqlodbc35w.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="C:\Program Files\PostgreSQL\8.2\lib\ms,C:\OpenSSL\lib\VC"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\PostgreSQL\8.2\lib\ms&quot;;&quot;C:\OpenSSL\lib\VC&quot;"
+				IgnoreAllDefaultLibraries="false"
 				ModuleDefinitionFile=".\psqlodbc.def"
-				DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll"
+				DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="psqlodbc35w.pdb"
 				SubSystem="2"
-- 
2.39.5