From c4bd47e77b2adf66c8b80d0f058822ef53e718a2 Mon Sep 17 00:00:00 2001
From: Hiroshi Inoue <inoue@tpf.co.jp>
Date: Wed, 5 Mar 2014 17:00:45 +0900
Subject: [PATCH] Pass the content of POSTGRES_RESOURCE_VERSION variable to the
 resource compiler correctly so that FileVersion and ProductVersion are
 properly set.

---
 version.h                 | 8 +++++---
 winbuild/psqlodbc.vcxproj | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/version.h b/version.h
index 3ebc162..69430a2 100644
--- a/version.h
+++ b/version.h
@@ -10,13 +10,15 @@
 #define __VERSION_H__
 
 /*
- *	BuildAll may pass POSTGRESDRIVERVERSION and PG_DRVFILE_VERSION
- *	via winbuild/psqlodbc.vcxproj.	
+ *	BuildAll may pass POSTGRESDRIVERVERSION, POSTGRES_RESOURCE_VERSION 
+ *	and PG_DRVFILE_VERSION via winbuild/psqlodbc.vcxproj.	
  */
 #ifndef POSTGRESDRIVERVERSION
 #define POSTGRESDRIVERVERSION		"09.03.0200"
 #endif
-#define POSTGRES_RESOURCE_VERSION	POSTGRESDRIVERVERSION "\0"
+#ifndef POSTGRES_RESOURCE_VERSION
+#define POSTGRES_RESOURCE_VERSION	POSTGRESDRIVERVERSION
+#endif
 #ifndef PG_DRVFILE_VERSION
 #define PG_DRVFILE_VERSION		9,3,02,00
 #endif
diff --git a/winbuild/psqlodbc.vcxproj b/winbuild/psqlodbc.vcxproj
index cde1123..7f921f9 100755
--- a/winbuild/psqlodbc.vcxproj
+++ b/winbuild/psqlodbc.vcxproj
@@ -178,7 +178,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(DRIVERVERSION)'!=''" >
     <ADD_DEFINES>$(ADD_DEFINES);POSTGRESDRIVERVERSION="$(DRIVERVERSION)"</ADD_DEFINES>
-    <RSC_DEFINES>$(RSC_DEFINES);POSTGRESDRIVERVERSION="$(DRIVERVERSION)";PG_DRVFILE_VERSION=$(DRIVERVERSION.substring(0, 2)),$(DRIVERVERSION.substring(3,2)),$(DRIVERVERSION.substring(6, 2)),$(DRIVERVERSION.substring(8, 2))</RSC_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'">
-- 
2.39.5