From 526f8de873c0efe9dce69aad9e62ee3a57ade9a9 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 Feb 2013 15:21:10 +0000 Subject: added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3731 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/DbChecker/dbchecker_10.vcxproj | 17 +++++++++-------- plugins/DbChecker/dbchecker_10.vcxproj.filters | 3 +++ plugins/DbChecker/dbchecker_11.vcxproj | 17 +++++++++-------- plugins/DbChecker/dbchecker_11.vcxproj.filters | 3 +++ plugins/DbChecker/res/version.rc | 6 ------ plugins/DbChecker/src/dbchecker.h | 10 +--------- plugins/DbChecker/src/main.cpp | 7 +++---- plugins/DbChecker/src/version.h | 24 +++++++++++++----------- 8 files changed, 41 insertions(+), 46 deletions(-) diff --git a/plugins/DbChecker/dbchecker_10.vcxproj b/plugins/DbChecker/dbchecker_10.vcxproj index b0687beb0a..335b4faad0 100644 --- a/plugins/DbChecker/dbchecker_10.vcxproj +++ b/plugins/DbChecker/dbchecker_10.vcxproj @@ -73,7 +73,7 @@ Disabled ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -85,7 +85,7 @@ _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -100,7 +100,7 @@ Disabled ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -111,7 +111,7 @@ _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -129,7 +129,7 @@ OnlyExplicitInline Size ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false true @@ -142,7 +142,7 @@ NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -162,7 +162,7 @@ OnlyExplicitInline Size ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false true @@ -175,7 +175,7 @@ NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -207,6 +207,7 @@ + diff --git a/plugins/DbChecker/dbchecker_10.vcxproj.filters b/plugins/DbChecker/dbchecker_10.vcxproj.filters index 6825c82e39..9f432d59e3 100644 --- a/plugins/DbChecker/dbchecker_10.vcxproj.filters +++ b/plugins/DbChecker/dbchecker_10.vcxproj.filters @@ -59,6 +59,9 @@ Header Files + + Header Files + diff --git a/plugins/DbChecker/dbchecker_11.vcxproj b/plugins/DbChecker/dbchecker_11.vcxproj index 7da1843731..cac269a92a 100644 --- a/plugins/DbChecker/dbchecker_11.vcxproj +++ b/plugins/DbChecker/dbchecker_11.vcxproj @@ -77,7 +77,7 @@ Disabled ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -89,7 +89,7 @@ _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -104,7 +104,7 @@ Disabled ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -115,7 +115,7 @@ _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -133,7 +133,7 @@ OnlyExplicitInline Size ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false true @@ -146,7 +146,7 @@ NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -166,7 +166,7 @@ OnlyExplicitInline Size ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false true @@ -179,7 +179,7 @@ NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories) + ..\..\include;..\..\include\msapi comctl32.lib;%(AdditionalDependencies) @@ -211,6 +211,7 @@ + diff --git a/plugins/DbChecker/dbchecker_11.vcxproj.filters b/plugins/DbChecker/dbchecker_11.vcxproj.filters index 6825c82e39..9f432d59e3 100644 --- a/plugins/DbChecker/dbchecker_11.vcxproj.filters +++ b/plugins/DbChecker/dbchecker_11.vcxproj.filters @@ -59,6 +59,9 @@ Header Files + + Header Files + diff --git a/plugins/DbChecker/res/version.rc b/plugins/DbChecker/res/version.rc index c20e13c88f..5bfbab4754 100644 --- a/plugins/DbChecker/res/version.rc +++ b/plugins/DbChecker/res/version.rc @@ -7,10 +7,6 @@ #include "afxres.h" #include "..\src\version.h" -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#endif //_WIN32 - VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING PRODUCTVERSION __FILEVERSION_STRING @@ -28,9 +24,7 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", "Miranda NG project" VALUE "FileDescription", __DESCRIPTION - VALUE "FileVersion", __FILEVERSION_STRING VALUE "InternalName", __PLUGIN_NAME VALUE "LegalCopyright", __COPYRIGHT VALUE "OriginalFilename", __FILENAME diff --git a/plugins/DbChecker/src/dbchecker.h b/plugins/DbChecker/src/dbchecker.h index 4039cab040..ea7d3909ae 100644 --- a/plugins/DbChecker/src/dbchecker.h +++ b/plugins/DbChecker/src/dbchecker.h @@ -20,27 +20,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - #include -#include -#include -#include -#include #include -#include #include #include #include -#include -#include #include #include #include #include #include "resource.h" +#include "version.h" #define WinVerMajor() LOBYTE(LOWORD(GetVersion())) #define IsWinVerXPPlus() (WinVerMajor()>=5 && LOWORD(GetVersion())!=5) diff --git a/plugins/DbChecker/src/main.cpp b/plugins/DbChecker/src/main.cpp index 6a4e543372..cc09e35f78 100644 --- a/plugins/DbChecker/src/main.cpp +++ b/plugins/DbChecker/src/main.cpp @@ -18,7 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "dbchecker.h" -#include "version.h" HINSTANCE hInst; int hLangpack = 0; @@ -31,7 +30,7 @@ PLUGININFOEX pluginInfoEx = { sizeof(pluginInfoEx), __PLUGIN_NAME, - __VERSION_DWORD, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, __AUTHOREMAIL, @@ -39,12 +38,12 @@ PLUGININFOEX pluginInfoEx = __AUTHORWEB, UNICODE_AWARE | STATIC_PLUGIN, // {A0138FC6-4C52-4501-AF93-7D3E20BCAE5B} - { 0xa0138fc6, 0x4c52, 0x4501, { 0xaf, 0x93, 0x7d, 0x3e, 0x20, 0xbc, 0xae, 0x5b}} + {0xa0138fc6, 0x4c52, 0x4501, {0xaf, 0x93, 0x7d, 0x3e, 0x20, 0xbc, 0xae, 0x5b}} }; ///////////////////////////////////////////////////////////////////////////////////////// -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInst = hinstDLL; return TRUE; diff --git a/plugins/DbChecker/src/version.h b/plugins/DbChecker/src/version.h index b6c1a876ae..83ebdb4e44 100644 --- a/plugins/DbChecker/src/version.h +++ b/plugins/DbChecker/src/version.h @@ -1,12 +1,14 @@ -#define __FILEVERSION_STRING 0,11,0,1 -#define __VERSION_STRING "0.11.0.1" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 11, 0, 1) +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 11 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 -#define __PLUGIN_NAME "Database Checker" -#define __INTERNAL_NAME "dbchecker" -#define __FILENAME "dbchecker.dll" -#define __DESCRIPTION "Miranda NG Database Checker." -#define __AUTHOR "George Hazan" -#define __AUTHOREMAIL "ghazan@miranda-ng.org" -#define __AUTHORWEB "http://www.miranda-ng.org/" -#define __COPYRIGHT "© 2012, George Hazan" +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Database checker" +#define __FILENAME "DbChecker.dll" +#define __DESCRIPTION "Miranda NG Database Checker." +#define __AUTHOR "George Hazan" +#define __AUTHOREMAIL "ghazan@miranda-ng.org" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2012 George Hazan" -- cgit v1.2.3