For the sake of clarity #define DBMS_NAME in psqlodbc.h instead of specifying MSBuild...

diff --git a/psqlodbc.h b/psqlodbc.h
index 220917c8c522ffd8383501708c9f4448540199c7..f613606607c3d03273c82ff7078a5dbf5114c7cc 100644 (file)
--- a/psqlodbc.h
+++ b/psqlodbc.h
@@ -278,12 +278,21 @@ SQLULEN ucs2strlen(const SQLWCHAR *);
 #define    SQL_WLONGVARCHAR    SQL_WLONGVARCHAR_IS_INHIBITED
 #define    SQL_C_WCHAR SQL_C_WCHAR_IS_INHIBITED
 #endif
+
 #ifndef DBMS_NAME
+#ifdef _WIN64
+#ifdef UNICODE_SUPPORT
+#define DBMS_NAME              DBMS_NAME_UNICODE"(x64)"
+#else
+#define DBMS_NAME              DBMS_NAME_ANSI"(x64)"
+#endif /* UNICODE_SUPPORT */
+#else  /* _WIN64 */
 #ifdef UNICODE_SUPPORT
 #define DBMS_NAME              DBMS_NAME_UNICODE
 #else
 #define DBMS_NAME              DBMS_NAME_ANSI
 #endif /* UNICODE_SUPPORT */
+#endif /* _WIN64 */
 #endif /* DBMS_NAME */
 
 #ifndef DBMS_NAME

diff --git a/winbuild/psqlodbc.vcxproj b/winbuild/psqlodbc.vcxproj
index 8c7eea8a28e061cbf60bc71311649cc57cf34d30..d31f81e4e173636325953286b235a549215e1be5 100755 (executable)
--- a/winbuild/psqlodbc.vcxproj
+++ b/winbuild/psqlodbc.vcxproj
@@ -115,7 +115,7 @@
     <OutDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
 \r
-  <Import Project="std_dbmsname.Cpp.props" />\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 a75bc28f707144bdd33b9eb6b905e022af99b938..95a8a4a2df39b693e359c03d86789c46263d1395 100644 (file)
--- a/winbuild/psqlsetup.vcxproj
+++ b/winbuild/psqlsetup.vcxproj
@@ -94,7 +94,7 @@
     <RSC_DEFINES>UNICODE_SUPPORT</RSC_DEFINES>\r
   </PropertyGroup>\r
 \r
-  <Import Project="std_dbmsname.Cpp.props" />\r
+  <!-- Import Project="std_dbmsname.Cpp.props" / -->\r
 \r
   <PropertyGroup Condition="'$(Platform)'=='Win32'">\r
     <TARGET_CPU>x86</TARGET_CPU>\r