From fcde89036de10acab55629910c935f45d9df4486 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 29 May 2012 16:32:52 +0000 Subject: Dbrw compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@227 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Dbrw/Version.h | 29 ++++++++++ plugins/Dbrw/Version.rc | 38 +++++++++++++ plugins/Dbrw/dbrw.c | 32 ++++------- plugins/Dbrw/dbrw.h | 4 +- plugins/Dbrw/dbrw_10.vcxproj | 2 + plugins/Dbrw/dbrw_10.vcxproj.filters | 6 ++ plugins/Dbrw/resource.rc | 104 ++++++++++++++++++++++------------- 7 files changed, 151 insertions(+), 64 deletions(-) create mode 100644 plugins/Dbrw/Version.h create mode 100644 plugins/Dbrw/Version.rc (limited to 'plugins/Dbrw') diff --git a/plugins/Dbrw/Version.h b/plugins/Dbrw/Version.h new file mode 100644 index 0000000000..a520e6f7a6 --- /dev/null +++ b/plugins/Dbrw/Version.h @@ -0,0 +1,29 @@ +#define __MAJOR_VERSION 1 +#define __MINOR_VERSION 4 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 0 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM +#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM + +#define __STRINGIFY_IMPL(x) #x +#define __STRINGIFY(x) __STRINGIFY_IMPL(x) +#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) + +#ifdef _UNICODE +#if defined(WIN64) || defined(_WIN64) + #define __PLUGIN_NAME "dbRW x64" +#else + #define __PLUGIN_NAME "dbRW (Unicode)" +#endif +#else + #define __PLUGIN_NAME "dbRW" +#endif +#define __INTERNAL_NAME "dbRW" +#define __FILENAME "dbRW.dll" +#define __DESCRIPTION "dbRW Database Driver for Miranda IM." +#define __DESCR "Miranda IM database driver engine powered by SQLite v" +#define __AUTHOR "Robert Rainwater" +#define __AUTHOREMAIL "rainwater@miranda-im.org" +#define __AUTHORWEB "http://www.miranda-im.org/" +#define __COPYRIGHT "© 2005-2011 Robert Rainwater" diff --git a/plugins/Dbrw/Version.rc b/plugins/Dbrw/Version.rc new file mode 100644 index 0000000000..e637f0cb33 --- /dev/null +++ b/plugins/Dbrw/Version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// +#include "afxres.h" +#include "version.h" + +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#endif //_WIN32 + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/plugins/Dbrw/dbrw.c b/plugins/Dbrw/dbrw.c index 854fa973ad..94ba1543f7 100644 --- a/plugins/Dbrw/dbrw.c +++ b/plugins/Dbrw/dbrw.c @@ -21,26 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "dbRW SQLite DB Driver", - PLUGIN_MAKE_VERSION(DBRW_VER_MAJOR,DBRW_VER_MINOR,0,0), - #ifdef DBRW_DEBUG - #ifdef DBRW_VER_ALPHA - "Miranda IM database driver engine powered by SQLite v" SQLITE_VERSION " [Debug Build Alpha #" DBRW_VER_ALPHA "]", - #else - "Miranda IM database driver engine powered by SQLite v" SQLITE_VERSION " [Debug Build]", - #endif - #else - #ifdef DBRW_VER_ALPHA - "Miranda IM database driver engine powered by SQLite v" SQLITE_VERSION " [Alpha #" DBRW_VER_ALPHA "]", - #else - "Miranda IM database driver engine powered by SQLite v" SQLITE_VERSION, - #endif - #endif - "Robert Rainwater", - "rainwater@miranda-im.org", - "Copyright © 2005-2011 Robert Rainwater", - "http://www.miranda-im.org/", - 0, + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCR SQLITE_VERSION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, DEFMOD_DB, {0xf3ca0e5e, 0x249a, 0x40f0, {0x8d, 0x74, 0x80, 0xa8, 0xe, 0xf0, 0xc8, 0x3d}} // {F3CA0E5E-249A-40f0-8D74-80A80EF0C83D} }; @@ -245,9 +233,9 @@ static int dbrw_Load(char *profile, void *link) utils_log_init(); #endif #ifdef DBRW_VER_ALPHA - log3("Loading dbRW v%s alpha #%s (SQLite v%s)", DBRW_VER_STRING, DBRW_VER_ALPHA, SQLITE_VERSION); + log3("Loading dbRW v%s alpha #%s (SQLite v%s)", __FILEVERSION_STRING, DBRW_VER_ALPHA, SQLITE_VERSION); #else - log2("Loading dbRW v%s (SQLite v%s)", DBRW_VER_STRING, SQLITE_VERSION); + log2("Loading dbRW v%s (SQLite v%s)", __FILEVERSION_STRING, SQLITE_VERSION); #endif utils_vacuum_check(); { diff --git a/plugins/Dbrw/dbrw.h b/plugins/Dbrw/dbrw.h index bde1f175c2..4990da6862 100644 --- a/plugins/Dbrw/dbrw.h +++ b/plugins/Dbrw/dbrw.h @@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef DBRW_H #define DBRW_H -#define DBRW_VER_MAJOR 1 -#define DBRW_VER_MINOR 4 -#define DBRW_VER_STRING "1.4" #define DBRW_VER_ALPHA "1" #define DBRW_SCHEMA_VERSION "2" #define DBRW_HEADER_STR "SQLite format 3" @@ -47,6 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "sqlite3/sqlite3.h" +#include "version.h" extern HINSTANCE g_hInst; extern sqlite3 *g_sqlite; diff --git a/plugins/Dbrw/dbrw_10.vcxproj b/plugins/Dbrw/dbrw_10.vcxproj index c33f82d480..910c88208e 100644 --- a/plugins/Dbrw/dbrw_10.vcxproj +++ b/plugins/Dbrw/dbrw_10.vcxproj @@ -197,9 +197,11 @@ + + diff --git a/plugins/Dbrw/dbrw_10.vcxproj.filters b/plugins/Dbrw/dbrw_10.vcxproj.filters index e8f2d7fabc..e2d32950f6 100644 --- a/plugins/Dbrw/dbrw_10.vcxproj.filters +++ b/plugins/Dbrw/dbrw_10.vcxproj.filters @@ -50,10 +50,16 @@ SQLite + + Header Files + Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/Dbrw/resource.rc b/plugins/Dbrw/resource.rc index 3183bdfc7c..a9b97ff327 100644 --- a/plugins/Dbrw/resource.rc +++ b/plugins/Dbrw/resource.rc @@ -1,42 +1,29 @@ -#include -#include "dbrw.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION DBRW_VER_MAJOR,DBRW_VER_MINOR,0,0 - PRODUCTVERSION DBRW_VER_MAJOR,DBRW_VER_MINOR,0,0 - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "Comments", "Licensed under the terms of the GNU General Public License" - VALUE "FileDescription", "dbRW Database Driver for Miranda IM" - #ifdef DBRW_VER_ALPHA - VALUE "FileVersion", DBRW_VER_STRING " alpha " DBRW_VER_ALPHA - #else - VALUE "FileVersion", DBRW_VER_STRING - #endif - VALUE "InternalName", "dbRW" - VALUE "LegalCopyright", "Copyright © 2006-2007 Robert Rainwater." - VALUE "OriginalFilename", "dbx_rw.dll" - VALUE "ProductName", "dbRW" - #ifdef DBRW_VER_ALPHA - VALUE "ProductVersion", DBRW_VER_STRING " alpha " DBRW_VER_ALPHA - #else - VALUE "ProductVersion", DBRW_VER_STRING - #endif - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Русский (Россия) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#pragma code_page(1251) + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + IDD_INFODLG DIALOGEX 0, 0, 205, 60 STYLE DS_FIXEDSYS | DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE @@ -46,3 +33,42 @@ BEGIN CTEXT "",IDC_TEXT,7,15,191,30,SS_CENTERIMAGE END +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // Русский (Россия) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED -- cgit v1.2.3