Move a property group about version number from psqlodbc.vcxproj to psqlodbc.Cpp...

diff --git a/winbuild/psqlodbc.Cpp.props b/winbuild/psqlodbc.Cpp.props
index 7edcfd7b55e139962e84b9d8b2eb0769c56f2b79..d0bb0a3e8fd52f5f40926d802288c79207bc857d 100644 (file)
--- 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 9f56fbbc91b2e9f4441a66ca9a286da4fea3bc23..494cc06ac8253b51cf788ec4688cf3c39dcfed16 100755 (executable)
--- a/winbuild/psqlodbc.vcxproj
+++ b/winbuild/psqlodbc.vcxproj
@@ -140,10 +140,6 @@
   <PropertyGroup Condition="'$(MEMORY_DEBUG)'=='yes'" >\r
     <ADD_DEFINES>$(ADD_DEFINES);_MEMORY_DEBUG_</ADD_DEFINES>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(DRIVERVERSION)'!=''" >\r
-    <ADD_DEFINES>$(ADD_DEFINES);POSTGRESDRIVERVERSION="$(DRIVERVERSION)"</ADD_DEFINES>\r
-    <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>\r
-  </PropertyGroup>\r
 \r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <LinkIncremental>true</LinkIncremental>\r