From e3e6c35d4479547b3641a8a8d33a6178749b1c87 Mon Sep 17 00:00:00 2001
From: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
Date: Tue, 20 Sep 2016 12:37:37 +0900
Subject: [PATCH] Move a property group about version number from
 psqlodbc.vcxproj to psqlodbc.Cpp.props so that different dlls share the same
 version number.

---
 winbuild/psqlodbc.Cpp.props | 4 ++++
 winbuild/psqlodbc.vcxproj   | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/winbuild/psqlodbc.Cpp.props b/winbuild/psqlodbc.Cpp.props
index 7edcfd7..d0bb0a3 100644
--- a/winbuild/psqlodbc.Cpp.props
+++ b/winbuild/psqlodbc.Cpp.props
@@ -16,6 +16,10 @@ psqlodbc.Cpp.props
       <WarningLevel>Level3</WarningLevel>
       <DisableSpecificWarnings>4018</DisableSpecificWarnings>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DRIVERVERSION)'!=''" >
+    <ADD_DEFINES>$(ADD_DEFINES);POSTGRESDRIVERVERSION="$(DRIVERVERSION)"</ADD_DEFINES>
+    <RSC_DEFINES>$(RSC_DEFINES);PG_DRVFILE_VERSION=$(DRIVERVERSION.substring(0, 2)),$(DRIVERVERSION.substring(3,2)),$(DRIVERVERSION.substring(6, 2)),$(DRIVERVERSION.substring(8, 2));POSTGRES_RESOURCE_VERSION=\"$(DRIVERVERSION)\"</RSC_DEFINES>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/winbuild/psqlodbc.vcxproj b/winbuild/psqlodbc.vcxproj
index 9f56fbb..494cc06 100755
--- a/winbuild/psqlodbc.vcxproj
+++ b/winbuild/psqlodbc.vcxproj
@@ -140,10 +140,6 @@
   <PropertyGroup Condition="'$(MEMORY_DEBUG)'=='yes'" >
     <ADD_DEFINES>$(ADD_DEFINES);_MEMORY_DEBUG_</ADD_DEFINES>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(DRIVERVERSION)'!=''" >
-    <ADD_DEFINES>$(ADD_DEFINES);POSTGRESDRIVERVERSION="$(DRIVERVERSION)"</ADD_DEFINES>
-    <RSC_DEFINES>$(RSC_DEFINES);PG_DRVFILE_VERSION=$(DRIVERVERSION.substring(0, 2)),$(DRIVERVERSION.substring(3,2)),$(DRIVERVERSION.substring(6, 2)),$(DRIVERVERSION.substring(8, 2));POSTGRES_RESOURCE_VERSION=\"$(DRIVERVERSION)\"</RSC_DEFINES>
-  </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-- 
2.39.5