From 946620182e3c67188a87176755844b8b5132d68b Mon Sep 17 00:00:00 2001 From: Hiroshi Saito Date: Tue, 29 Aug 2006 18:17:40 +0000 Subject: [PATCH] Initial value has set MSDTC=no of VC6. (Support of MSDTC is only VC7 and VC8) Addition which is a driver name in a resource. (Unicode or ANSI) --- psqlodbc.rc | 40 ++++++++++++++++++++++++++++++++++++---- win32.mak | 1 + 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/psqlodbc.rc b/psqlodbc.rc index 5f6d7e8..612c2a4 100644 --- a/psqlodbc.rc +++ b/psqlodbc.rc @@ -30,7 +30,11 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT DLG_CONFIG DIALOGEX 65, 43, 359, 219 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "PostgreSQL Japanese ODBC ƒZƒbƒgƒAƒbƒv" +#ifdef UNICODE_SUPPORT +CAPTION "PostgreSQL Unicode ODBC ƒZƒbƒgƒAƒbƒv" +#else +CAPTION "PostgreSQL ANSI ODBC ƒZƒbƒgƒAƒbƒv" +#endif FONT 9, "‚l‚r ƒSƒVƒbƒN", 0, 0, 0x1 BEGIN RTEXT "ƒf|ƒ^ƒ\|ƒX–¼:(&N)",IDC_DSNAMETEXT,2,9,63,17,NOT @@ -332,14 +336,26 @@ BEGIN BEGIN BLOCK "041104e4" BEGIN - VALUE "Comments", "PostgreSQL ODBC driver Japanese\0" +#ifdef UNICODE_SUPPORT + VALUE "Comments", "PostgreSQL Unicode ODBC driver Japanese\0" +#else + VALUE "Comments", "PostgreSQL ANSI ODBC driver Japanese\0" +#endif VALUE "CompanyName", "PostgreSQL Global Development Group\0" VALUE "FileDescription", "PostgreSQL ODBC Driver (Japanese)\0" VALUE "FileVersion", POSTGRES_RESOURCE_VERSION +#ifdef UNICODE_SUPPORT VALUE "InternalName", "psqlodbc35w\0" +#else + VALUE "InternalName", "psqlodbca\0" +#endif VALUE "LegalCopyright", "\0" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoftƒ‡ is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0" +#ifdef UNICODE_SUPPORT VALUE "OriginalFilename", "psqlodbc35w.dll\0" +#else + VALUE "OriginalFilename", "psqlodbca.dll\0" +#endif VALUE "PrivateBuild", "for Japanese by Hiroshi Inoue & Hiroshi Saito\0" VALUE "ProductName", "PostgreSQL\0" VALUE "ProductVersion", POSTGRES_RESOURCE_VERSION @@ -402,7 +418,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US DLG_CONFIG DIALOG DISCARDABLE 65, 43, 305, 142 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "PostgreSQL ODBC Driver (psqlODBC) Setup" +#ifdef UNICODE_SUPPORT +CAPTION "PostgreSQL Unicode ODBC Driver (psqlODBC) Setup" +#else +CAPTION "PostgreSQL ANSI ODBC Driver (psqlODBC) Setup" +#endif FONT 8, "MS Sans Serif" BEGIN RTEXT "&Data Source",IDC_DSNAMETEXT,3,25,50,12,NOT WS_GROUP @@ -662,14 +682,26 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "Comments", "PostgreSQL ODBC driver\0" +#ifdef UNICODE_SUPPORT + VALUE "Comments", "PostgreSQL Unicode ODBC driver\0" +#else + VALUE "Comments", "PostgreSQL ANSI ODBC driver\0" +#endif VALUE "CompanyName", "PostgreSQL Global Development Group\0" VALUE "FileDescription", "PostgreSQL ODBC Driver (English)\0" VALUE "FileVersion", POSTGRES_RESOURCE_VERSION +#ifdef UNICODE_SUPPORT VALUE "InternalName", "psqlodbc35w\0" +#else + VALUE "InternalName", "psqlodbca\0" +#endif VALUE "LegalCopyright", "Copyright \0" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0" +#ifdef UNICODE_SUPPORT VALUE "OriginalFilename", "psqlodbc35w.dll\0" +#else + VALUE "OriginalFilename", "psqlodbca.dll\0" +#endif VALUE "PrivateBuild", "\0" VALUE "ProductName", "PostgreSQL\0" VALUE "ProductVersion", POSTGRES_RESOURCE_VERSION diff --git a/win32.mak b/win32.mak index 99fee92..3401745 100644 --- a/win32.mak +++ b/win32.mak @@ -65,6 +65,7 @@ ADD_DEFINES = $(ADD_DEFINES) /D "SSL_DLL=\"$(SSL_DLL)\"" !IF "$(_NMAKE_VER)" == "6.00.9782.0" MSVC_VERSION=vc60 VC07_DELAY_LOAD= +MSDTC = "no" !ELSE MSVC_VERSION=vc70 VC07_DELAY_LOAD="/DelayLoad:libpq.dll /DelayLoad:$(SSL_DLL) /DELAY:UNLOAD" -- 2.39.5