From 3069ae6f15fbd55a7213aa2b3a76498e529dd4e4 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Wed, 13 Jul 2005 15:41:31 +0000
Subject: [PATCH] Rename driver for parallel testing with stable version.
 Update installer.

---
 configure.ac            |  2 +-
 installer/psqlodbc.wxs  | 22 ++++++++++-----------
 installer/psqlodbcm.wxs | 43 +++++++++++++++++++++++++---------------
 psqlodbc.reg            |  8 ++++----
 psqlodbc_win32.def      |  2 +-
 win32.mak               | 44 ++++++++++++++++++++---------------------
 6 files changed, 66 insertions(+), 55 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b0ab8f..8d42d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(psqlodbc, 08.01.0001, [pgsql-odbc@postgresql.org])
+AC_INIT(psqlodbclibpq, 08.01.0001, [pgsql-odbc@postgresql.org])
 AC_PREREQ(2.52)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([bind.c])
diff --git a/installer/psqlodbc.wxs b/installer/psqlodbc.wxs
index c77e495..8754759 100644
--- a/installer/psqlodbc.wxs
+++ b/installer/psqlodbc.wxs
@@ -5,17 +5,17 @@
 
   <Product 
     Manufacturer="PostgreSQL Global Development Group" 
-    Id="BD868C41-BB9B-4AA7-A3F1-DB1FA1A02610" 
-    Name="psqlODBC" 
+    Id="4633256F-8709-495f-B4D1-A022EFAE7C39" 
+    Name="psqlODBC (libpq)" 
     Version="$(var.VERSION)" 
     Language="1033">
       
 <!-- Package details -->
 
 	<Package 
-      Id="15462631-9E20-4834-A4E4-AA1425B751B6" 
+      Id="97EF9C01-B395-4d6e-8A01-3338A1E9E742" 
       Keywords="PostgreSQL, ODBC" 
-      Comments="PostgreSQL ODBC Driver"
+      Comments="PostgreSQL ODBC Driver (libpq)"
       Manufacturer="PostgreSQL Global Development Group" 
       InstallerVersion="110" 
       Languages="1033" 
@@ -57,7 +57,7 @@
       
 <!-- Cancel dialog -->
 
-      <Dialog Id="Cancel" Width="233" Height="127" Title="psqlODBC" NoMinimize="yes">
+      <Dialog Id="Cancel" Width="233" Height="127" Title="psqlODBC (libpq) $(var.VERSION)" NoMinimize="yes">
         <Control Id="No" Type="PushButton" X="101" Y="101" Width="56" Height="17" Default="yes">
           <Text>&amp;Resume</Text>
           <Publish Event="EndDialog" Value="Return">1</Publish>
@@ -100,7 +100,7 @@
 
 <!-- Exit dialog -->
 
-      <Dialog Id="Exit_Dialog" Width="375" Height="270" Title="psqlODBC $(var.VERSION)">
+      <Dialog Id="Exit_Dialog" Width="375" Height="270" Title="psqlODBC (libpq) $(var.VERSION)">
         
         <!-- common dialog items -->
         <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
@@ -128,7 +128,7 @@
           <Text>{\Arial10Bold}Installation complete!</Text>
         </Control>
         <Control Id="ui2" Type="Text" X="10" Y="75" Width="365" Height="30" Transparent="yes">
-          <Text>Congratulations, psqlODBC $(var.VERSION) has been successfully installed on your system.</Text>
+          <Text>Congratulations, psqlODBC (libpq) $(var.VERSION) has been successfully installed on your system.</Text>
         </Control>  
         <Control Id="wc_txt3" Type="Text" X="10" Y="200" Width="365" Height="30" Transparent="yes">
           <Text>Click the finish button to exit from the installer.</Text>
@@ -137,7 +137,7 @@
       
 <!-- Welcome dialog -->
 
-      <Dialog Id="Welcome_Dialog" Width="375" Height="270" Title="psqlODBC $(var.VERSION)" CustomPalette="yes">
+      <Dialog Id="Welcome_Dialog" Width="375" Height="270" Title="psqlODBC (libpq) $(var.VERSION)" CustomPalette="yes">
       
         <!-- common dialog items -->
         <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
@@ -171,7 +171,7 @@
       
 <!-- Licence Dialogue -->
 
-      <Dialog Id="Licence_Dialog" Width="375" Height="270" Title="psqlODBC $(var.VERSION)" CustomPalette="yes">
+      <Dialog Id="Licence_Dialog" Width="375" Height="270" Title="psqlODBC (libpq) $(var.VERSION)" CustomPalette="yes">
         
         <!-- common dialog items -->
         <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
@@ -206,7 +206,7 @@
   
 <!-- Ready dialogue -->
 
-      <Dialog Id="Ready_Dialog" Width="375" Height="270" Title="psqlODBC $(var.VERSION)" CustomPalette="yes">
+      <Dialog Id="Ready_Dialog" Width="375" Height="270" Title="psqlODBC (libpq) $(var.VERSION)" CustomPalette="yes">
          
         <!-- common dialog items -->
         <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
@@ -239,7 +239,7 @@
   
 <!-- Progress Dialogue -->
 
-      <Dialog Id="Progress_Dialog" Width="375" Height="270" Title="psqlODBC $(var.VERSION)" CustomPalette="yes" Modeless="yes">
+      <Dialog Id="Progress_Dialog" Width="375" Height="270" Title="psqlODBC (libpq) $(var.VERSION)" CustomPalette="yes" Modeless="yes">
     
         <!-- common dialog items -->
         <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index e5e7d8f..3d45484 100644
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
   <Module 
-    Id="psqlODBC"
-    Guid="BD868C41-BB9B-4AA7-A3F1-DB1FA1A02610" 
+    Id="psqlODBC (libpq)"
+    Guid="5BFFAF7C-2B0A-4ea2-8348-86459DD8ADB8" 
     Version="$(var.VERSION)" 
     Language="1033">
     
     <Package 
-      Id="A182B0DB-ED70-46C7-AED4-5C92D6F05756" 
-      Description="PostgreSQL ODBC Driver"
+      Id="DCD49637-94AD-49dc-9F8C-00322562E4B6" 
+      Description="PostgreSQL ODBC Driver (libpq)"
       Keywords="PostgreSQL, ODBC" 
       Manufacturer="PostgreSQL Global Development Group" 
       InstallerVersion="110" 
@@ -18,21 +18,32 @@
       SummaryCodepage="1252" />
     
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="SystemFolder.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Name="Redist">
-        <Component Id="psqlodbc.dll.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Guid="41B28294-AE87-43FE-B615-531CD4911047">
-          <File Id="psqlodbc.dll.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Name="psqlodbc.dll" KeyPath="yes" src="../Release/psqlodbc.dll" />
+      <Directory Id="SystemFolder" Name="Redist">
+        <Component Id="psqlodbc.files" Guid="F66FBDE8-2E5C-4759-A8DC-85052DAA1374">
+        
+          <!-- PostgreSQL -->
+          <File Id="psqlodbclibpq.dll" LongName="psqlodbclibpq.dll" Name="psqlod~1.dll" KeyPath="yes" src="../Release/psqlodbclibpq.dll" />
+          <File Id="libpq.dll" Name="libpq.dll" src="C:\Windows\System32\libpq.dll" />
+          
+          <!-- Gettext -->
+          <File Id="libintl-2.dll" LongName="libintl-2.dll" Name="libint~1.dll" src="C:\Windows\System32\libintl-2.dll" />
+          <File Id="libiconv-2.dll" LongName="libiconv-2.dll" Name="libico~1.dll" src="C:\Windows\System32\libiconv-2.dll" />
+          
+          <!-- SSL -->
+          <File Id="libeay32.dll" Name="libeay32.dll" src="C:\Windows\System32\libeay32.dll" />
+          <File Id="ssleay32.dll" Name="ssleay32.dll" src="C:\Windows\System32\ssleay32.dll" />
           
           <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
           <!--       so we install the registry keys manually ourselves.                         -->
-          <Registry Id="psqlodbc.reg.1.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL" Type="string" Value="Installed" />
-          <Registry Id="psqlodbc.reg.2.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="APILevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc.reg.3.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="ConnectFunctions" Type="string" Value="YYN" />
-          <Registry Id="psqlodbc.reg.4.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="Driver" Type="string" Value="[#psqlodbc.dll.A182B0DB_ED70_46C7_AED4_5C92D6F05756]" />
-          <Registry Id="psqlodbc.reg.5.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="DriverODBCVer" Type="string" Value="03.00" />
-          <Registry Id="psqlodbc.reg.6.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="FileUsage" Type="string" Value="0" />
-          <Registry Id="psqlodbc.reg.7.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="Setup" Type="string" Value="[#psqlodbc.dll.A182B0DB_ED70_46C7_AED4_5C92D6F05756]" />
-          <Registry Id="psqlodbc.reg.8.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="SQLLevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc.reg.9.A182B0DB_ED70_46C7_AED4_5C92D6F05756" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL" Name="UsageCount" Type="integer" Value="1" />
+          <Registry Id="psqlodbc.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL-libpq" Type="string" Value="Installed" />
+          <Registry Id="psqlodbc.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="APILevel" Type="string" Value="1" />
+          <Registry Id="psqlodbc.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="ConnectFunctions" Type="string" Value="YYN" />
+          <Registry Id="psqlodbc.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="Driver" Type="string" Value="[#psqlodbclibpq.dll]" />
+          <Registry Id="psqlodbc.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="DriverODBCVer" Type="string" Value="03.00" />
+          <Registry Id="psqlodbc.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="FileUsage" Type="string" Value="0" />
+          <Registry Id="psqlodbc.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="Setup" Type="string" Value="[#psqlodbclibpq.dll]" />
+          <Registry Id="psqlodbc.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="SQLLevel" Type="string" Value="1" />
+          <Registry Id="psqlodbc.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq" Name="UsageCount" Type="integer" Value="1" />
         </Component>
       </Directory>
     </Directory>
diff --git a/psqlodbc.reg b/psqlodbc.reg
index 1cedce0..c0603ea 100644
--- a/psqlodbc.reg
+++ b/psqlodbc.reg
@@ -3,14 +3,14 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"PostgreSQL"="Installed"
+"PostgreSQL-libpq"="Installed"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL]
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL-libpq]
 "APILevel"="1"
 "ConnectFunctions"="YYN"
-"Driver"="PSQLODBC.DLL"
+"Driver"="PSQLODBCLIBPQ.DLL"
 "DriverODBCVer"="03.00"
 "FileUsage"="0"
-"Setup"="PSQLODBC.DLL"
+"Setup"="PSQLODBCLIBPQ.DLL"
 "SQLLevel"="1"
 "UsageCount"=dword:00000001
\ No newline at end of file
diff --git a/psqlodbc_win32.def b/psqlodbc_win32.def
index d3bd3c7..defb69e 100644
--- a/psqlodbc_win32.def
+++ b/psqlodbc_win32.def
@@ -1,4 +1,4 @@
-LIBRARY psqlodbc
+LIBRARY psqlodbclibpq
 EXPORTS
 ;SQLAllocConnect @1
 ;SQLAllocEnv @2
diff --git a/win32.mak b/win32.mak
index 1987385..2bf1c08 100644
--- a/win32.mak
+++ b/win32.mak
@@ -79,7 +79,7 @@ OUTDIR=.\Release
 OUTDIRBIN=.\Release
 INTDIR=.\Release
 
-ALL : "$(OUTDIRBIN)\psqlodbc.dll"
+ALL : "$(OUTDIRBIN)\psqlodbclibpq.dll"
 
 
 CLEAN :
@@ -118,10 +118,10 @@ CLEAN :
 	-@erase "$(INTDIR)\odbcapi30.obj"
 	-@erase "$(INTDIR)\descriptor.obj"
 	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\psqlodbc.dll"
-	-@erase "$(OUTDIR)\psqlodbc.exp"
-	-@erase "$(OUTDIR)\psqlodbc.lib"
-	-@erase "$(OUTDIR)\psqlodbc.pch"
+	-@erase "$(OUTDIR)\psqlodbclibpq.dll"
+	-@erase "$(OUTDIR)\psqlodbclibpq.exp"
+	-@erase "$(OUTDIR)\psqlodbclibpq.lib"
+	-@erase "$(OUTDIR)\psqlodbclibpq.pch"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -129,9 +129,9 @@ CLEAN :
 CPP=cl.exe
 
 !IF "$(MODE)"=="USE_LIBPQ"
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "$(PG_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "$(PG_INC)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbclibpq.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 !ELSE
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbclibpq.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 !ENDIF
 
 .c{$(INTDIR)}.obj::
@@ -175,9 +175,9 @@ BSC32_SBRS= \
 LINK32=link.exe
 
 !IF "$(MODE)"=="USE_LIBPQ"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpq.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIRBIN)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /libpath:"$(PG_LIB)"
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpq.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbclibpq.pdb" /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIRBIN)\psqlodbclibpq.dll" /implib:"$(OUTDIR)\psqlodbclibpq.lib" /libpath:"$(PG_LIB)"
 !ELSE
-LINK32_FLAGS=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 /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIRBIN)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" 
+LINK32_FLAGS=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 /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbclibpq.pdb" /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIRBIN)\psqlodbclibpq.dll" /implib:"$(OUTDIR)\psqlodbclibpq.lib" 
 !ENDIF
 
 
@@ -218,7 +218,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\descriptor.obj" \
 	"$(INTDIR)\psqlodbc.res"
 
-"$(OUTDIRBIN)\psqlodbc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIRBIN)\psqlodbclibpq.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -229,7 +229,7 @@ OUTDIR=.\Debug
 OUTDIRBIN=.\Debug
 INTDIR=.\Debug
 
-ALL : "$(OUTDIR)\psqlodbc.dll"
+ALL : "$(OUTDIR)\psqlodbclibpq.dll"
 
 
 CLEAN :
@@ -269,12 +269,12 @@ CLEAN :
 	-@erase "$(INTDIR)\descriptor.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\psqlodbc.dll"
-	-@erase "$(OUTDIR)\psqlodbc.exp"
-	-@erase "$(OUTDIR)\psqlodbc.ilk"
-	-@erase "$(OUTDIR)\psqlodbc.lib"
-	-@erase "$(OUTDIR)\psqlodbc.pdb"
-	-@erase "$(OUTDIR)\psqlodbc.pch"
+	-@erase "$(OUTDIR)\psqlodbclibpq.dll"
+	-@erase "$(OUTDIR)\psqlodbclibpq.exp"
+	-@erase "$(OUTDIR)\psqlodbclibpq.ilk"
+	-@erase "$(OUTDIR)\psqlodbclibpq.lib"
+	-@erase "$(OUTDIR)\psqlodbclibpq.pdb"
+	-@erase "$(OUTDIR)\psqlodbclibpq.pch"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -282,9 +282,9 @@ CLEAN :
 CPP=cl.exe
 
 !IF "$(MODE)"=="USE_LIBPQ"
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od  /I "$(PG_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)"  /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od  /I "$(PG_INC)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)"  /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbclibpq.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 !ELSE
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)"  /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "$(MODE)"  /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbclibpq.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 !ENDIF
 
 .c{$(INTDIR)}.obj::
@@ -328,9 +328,9 @@ BSC32_SBRS= \
 LINK32=link.exe
 
 !IF "$(MODE)"=="USE_LIBPQ"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpq.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIR)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept /libpath:"$(PG_LIB)"
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpq.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbclibpq.pdb" /debug /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIR)\psqlodbclibpq.dll" /implib:"$(OUTDIR)\psqlodbclibpq.lib" /pdbtype:sept /libpath:"$(PG_LIB)"
 !ELSE
-LINK32_FLAGS=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 /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIR)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept 
+LINK32_FLAGS=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 /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbclibpq.pdb" /debug /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIR)\psqlodbclibpq.dll" /implib:"$(OUTDIR)\psqlodbclibpq.lib" /pdbtype:sept 
 !ENDIF
 
 DEF_FILE= "psqlodbc_win32.def"
@@ -370,7 +370,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\descriptor.obj" \
 	"$(INTDIR)\psqlodbc.res"
 
-"$(OUTDIR)\psqlodbc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\psqlodbclibpq.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
-- 
2.39.5