From: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
Date: Fri, 4 Nov 2016 04:04:20 +0000 (+0900)
Subject: Ensure that psqlodbc35w(30a) and psqlsetup(a) share the same driver info.
X-Git-Tag: REL-09_06_0100~47
X-Git-Url: http://git.postgresql.org/gitweb/static/session/%7B%7Bsession.id%7D%7D-%7B%7Bsession.title%7Cslugify%7D%7D?a=commitdiff_plain;h=ddab2e2c4bfe67c3eb7284995a71bd53fa33fb07;p=psqlodbc.git

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

diff --git a/winbuild/psqlodbc.vcxproj b/winbuild/psqlodbc.vcxproj
index 91606a3..8c7eea8 100755
--- a/winbuild/psqlodbc.vcxproj
+++ b/winbuild/psqlodbc.vcxproj
@@ -99,6 +99,8 @@
     <TargetType>Unicode</TargetType>
     <MAINDEF>$(srcPath)psqlodbc.def</MAINDEF>
     <DTCDLL>pgenlist</DTCDLL>
+    <ADD_DEFINES>UNICODE_SUPPORT;UNICODE_SUPPORTXX</ADD_DEFINES>
+    <RSC_DEFINES>UNICODE_SUPPORT</RSC_DEFINES>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)'=='Win32'">
@@ -113,20 +115,7 @@
     <OutDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</OutDir>
   </PropertyGroup>
 
-  <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);UNICODE_SUPPORT;UNICODE_SUPPORTXX</ADD_DEFINES>
-    <RSC_DEFINES>$(RSC_DEFINES);UNICODE_SUPPORT</RSC_DEFINES>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|x64'" >
-    <ADD_DEFINES>$(ADD_DEFINES);UNICODE_SUPPORT;UNICODE_SUPPORTXX;DBMS_NAME="PostgreSQL Unicode(x64)"</ADD_DEFINES>
-    <RSC_DEFINES>$(RSC_DEFINES);UNICODE_SUPPORT</RSC_DEFINES>
-  </PropertyGroup>
+  <Import Project="std_dbmsname.Cpp.props" />
 
   <PropertyGroup Condition="'$(MSDTC)'=='yes'">
     <ADD_DEFINES>$(ADD_DEFINES);_HANDLE_ENLIST_IN_DTC_</ADD_DEFINES>
diff --git a/winbuild/psqlsetup.vcxproj b/winbuild/psqlsetup.vcxproj
index d334e03..a171a04 100644
--- a/winbuild/psqlsetup.vcxproj
+++ b/winbuild/psqlsetup.vcxproj
@@ -94,6 +94,8 @@
     <RSC_DEFINES>UNICODE_SUPPORT</RSC_DEFINES>
   </PropertyGroup>
 
+  <Import Project="std_dbmsname.Cpp.props" />
+
   <PropertyGroup Condition="'$(Platform)'=='Win32'">
     <TARGET_CPU>x86</TARGET_CPU>
   </PropertyGroup>
diff --git a/winbuild/std_dbmsname.Cpp.props b/winbuild/std_dbmsname.Cpp.props
new file mode 100644
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>