Ensure that psqlodbc35w(30a) and psqlsetup(a) share the same driver info.

diff --git a/winbuild/psqlodbc.vcxproj b/winbuild/psqlodbc.vcxproj
index 91606a3ddc767bf9f4d492aa0b6720315c2118cc..8c7eea8a28e061cbf60bc71311649cc57cf34d30 100755 (executable)
--- a/winbuild/psqlodbc.vcxproj
+++ b/winbuild/psqlodbc.vcxproj
@@ -99,6 +99,8 @@
     <TargetType>Unicode</TargetType>\r
     <MAINDEF>$(srcPath)psqlodbc.def</MAINDEF>\r
     <DTCDLL>pgenlist</DTCDLL>\r
+    <ADD_DEFINES>UNICODE_SUPPORT;UNICODE_SUPPORTXX</ADD_DEFINES>\r
+    <RSC_DEFINES>UNICODE_SUPPORT</RSC_DEFINES>\r
   </PropertyGroup>\r
 \r
   <PropertyGroup Condition="'$(Platform)'=='Win32'">\r
@@ -113,20 +115,7 @@
     <OutDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
 \r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|Win32'" >\r
-    <ADD_DEFINES>$(ADD_DEFINES);DBMS_NAME="PostgreSQL ANSI"</ADD_DEFINES>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|x64'" >\r
-    <ADD_DEFINES>$(ADD_DEFINES);DBMS_NAME="PostgreSQL ANSI(x64)"</ADD_DEFINES>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|Win32'" >\r
-    <ADD_DEFINES>$(ADD_DEFINES);UNICODE_SUPPORT;UNICODE_SUPPORTXX</ADD_DEFINES>\r
-    <RSC_DEFINES>$(RSC_DEFINES);UNICODE_SUPPORT</RSC_DEFINES>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|x64'" >\r
-    <ADD_DEFINES>$(ADD_DEFINES);UNICODE_SUPPORT;UNICODE_SUPPORTXX;DBMS_NAME="PostgreSQL Unicode(x64)"</ADD_DEFINES>\r
-    <RSC_DEFINES>$(RSC_DEFINES);UNICODE_SUPPORT</RSC_DEFINES>\r
-  </PropertyGroup>\r
+  <Import Project="std_dbmsname.Cpp.props" />\r
 \r
   <PropertyGroup Condition="'$(MSDTC)'=='yes'">\r
     <ADD_DEFINES>$(ADD_DEFINES);_HANDLE_ENLIST_IN_DTC_</ADD_DEFINES>\r

diff --git a/winbuild/psqlsetup.vcxproj b/winbuild/psqlsetup.vcxproj
index d334e03744e436b9f4e12965c5d9a173ae1b932f..a171a0491f77291eb13ccb121733bf7b29d82e58 100644 (file)
--- a/winbuild/psqlsetup.vcxproj
+++ b/winbuild/psqlsetup.vcxproj
@@ -94,6 +94,8 @@
     <RSC_DEFINES>UNICODE_SUPPORT</RSC_DEFINES>\r
   </PropertyGroup>\r
 \r
+  <Import Project="std_dbmsname.Cpp.props" />\r
+\r
   <PropertyGroup Condition="'$(Platform)'=='Win32'">\r
     <TARGET_CPU>x86</TARGET_CPU>\r
   </PropertyGroup>\r

diff --git a/winbuild/std_dbmsname.Cpp.props b/winbuild/std_dbmsname.Cpp.props
new file mode 100644 (file)
index 0000000..be14129
--- /dev/null
+++ b/winbuild/std_dbmsname.Cpp.props
@@ -0,0 +1,22 @@
+<!--
+***********************************************************************************************
+dbmsname.Cpp.props
+
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--     -->
+  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|Win32'" >
+    <ADD_DEFINES>$(ADD_DEFINES);DBMS_NAME="PostgreSQL ANSI"</ADD_DEFINES>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|x64'" >
+    <ADD_DEFINES>$(ADD_DEFINES);DBMS_NAME="PostgreSQL ANSI(x64)"</ADD_DEFINES>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|Win32'" >
+    <ADD_DEFINES>$(ADD_DEFINES);DBMS_NAME="PostgreSQL Unicode"</ADD_DEFINES>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|x64'" >
+    <ADD_DEFINES>$(ADD_DEFINES);DBMS_NAME="PostgreSQL Unicode(x64)"</ADD_DEFINES>
+  </PropertyGroup>
+</Project>