fixed version info

git-svn-id: http://svn.miranda-ng.org/main/trunk@3535 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 41 insertions, 132 deletions

diff --git a/plugins/Console/Console_11.vcxproj b/plugins/Console/Console_11.vcxproj
index 6921b0fa50..f9345f2909 100644
--- a/plugins/Console/Console_11.vcxproj
+++ b/plugins/Console/Console_11.vcxproj
@@ -77,7 +77,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -96,13 +96,14 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <SubSystem>Windows</SubSystem>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -120,6 +121,7 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <SubSystem>Windows</SubSystem>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -127,7 +129,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -149,6 +151,7 @@
       <SubSystem>Windows</SubSystem>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -156,7 +159,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -178,6 +181,7 @@
       <SubSystem>Windows</SubSystem>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -186,7 +190,6 @@
     </ClCompile>

     <ClCompile Include="src\Console.cpp" />

     <ClCompile Include="src\init.cpp" />

-    <ClCompile Include="src\Commonheaders.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\Commonheaders.h" />

diff --git a/plugins/Console/Console_11.vcxproj.filters b/plugins/Console/Console_11.vcxproj.filters
index f497b06cd9..8139c98e03 100644
--- a/plugins/Console/Console_11.vcxproj.filters
+++ b/plugins/Console/Console_11.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\Commonheaders.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\Console.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/plugins/Console/res/version.rc b/plugins/Console/res/version.rc
index d095fdddac..5bfbab4754 100644
--- a/plugins/Console/res/version.rc
+++ b/plugins/Console/res/version.rc
@@ -4,54 +4,31 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include <winres.h>

-#include <..\src\version.h>

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

+#include "afxres.h"

+#include "..\src\version.h"

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK 0x3fL

+ FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

- FILEOS 0x40004L

- FILETYPE 0x1L

+ FILEOS 0x4L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "FileDescription", __PLUGIN_DESC

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", __PLUGIN_SHORTNAME

-            VALUE "LegalCopyright", __PLUGIN_RIGHTS

-            VALUE "OriginalFilename", __PLUGIN_FILE

-            VALUE "ProductName", __PLUGIN_SHORTNAME

-            VALUE "ProductVersion", __VERSION_STRING

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

         END

     END

     BLOCK "VarFileInfo"

@@ -59,5 +36,3 @@ BEGIN
         VALUE "Translation", 0x0, 1200

     END

 END

-

-#endif

diff --git a/plugins/Console/src/commonheaders.cpp b/plugins/Console/src/commonheaders.cpp
deleted file mode 100644
index cbfb79d624..0000000000
--- a/plugins/Console/src/commonheaders.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*

-

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright 2000-2008 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#include "commonheaders.h"
\ No newline at end of file
diff --git a/plugins/Console/src/commonheaders.h b/plugins/Console/src/commonheaders.h
index 7689c7dce2..4f6f420148 100644
--- a/plugins/Console/src/commonheaders.h
+++ b/plugins/Console/src/commonheaders.h
@@ -24,40 +24,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _CRT_SECURE_NO_WARNINGS

 #define _WIN32_WINNT 0x0501

 

-#pragma comment( lib, "comctl32.lib")

-

 #include <windows.h>

-#include <stdio.h>

-#include <time.h>

-#include <stddef.h>

-#include <process.h>

 #include <commctrl.h>

-#include <Richedit.h>

 #include <malloc.h>

-#include <tchar.h>

-#include <io.h>

-#include <fcntl.h>

-

-#define MIRANDA_VER 0x0A00

 

 #include <newpluginapi.h>

 #include <win2k.h>

-#include <m_system.h>

-#include <m_utils.h>

 #include <m_netlib.h>

 #include <m_database.h>

 #include <m_options.h>

 #include <m_langpack.h>

-#include <m_clui.h>

 #include <m_clist.h>

-#include <m_langpack.h>

 #include <m_button.h>

 #include <m_fontservice.h>

 #include <m_hotkeys.h>

-#include <m_icolib.h>

+

 #include <m_toptoolbar.h>

-#include "resource.h"

 

+#include "resource.h"

 #include "version.h"

 

 extern HINSTANCE hInst;

diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp
index 5dc110e778..4a31091bd2 100644
--- a/plugins/Console/src/init.cpp
+++ b/plugins/Console/src/init.cpp
@@ -30,14 +30,14 @@ HINSTANCE hInst;
 PLUGININFOEX pluginInfoEx={

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

-	__VERSION_DWORD,

-	__PLUGIN_LONGDESC,

-	__PLUGIN_AUTHOR,

-	__PLUGIN_EMAIL,

-	__PLUGIN_RIGHTS,

-	__PLUGIN_URL,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {23D4F302-D513-45b7-9027-445F29557311}

+	// {23D4F302-D513-45B7-9027-445F29557311}

 	{0x23d4f302, 0xd513, 0x45b7, {0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11}}

 };

 

diff --git a/plugins/Console/src/version.h b/plugins/Console/src/version.h
index 7cde649cc9..9e6cc6d752 100644
--- a/plugins/Console/src/version.h
+++ b/plugins/Console/src/version.h
@@ -1,40 +1,14 @@
-/*

-

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright 2000-2008 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-

-#define __FILEVERSION_STRING 0,0,7,3

-#define __VERSION_STRING     "0.0.7.3"

-#define __VERSION_DWORD      0x00000703

-

-

-#define __PLUGIN_DESC        "Console log window for Miranda."

-#define __PLUGIN_LONGDESC    __PLUGIN_DESC

-#define __PLUGIN_AUTHOR      "Bio"

-#define __PLUGIN_EMAIL       "bio@ktaspb.ru"

-#define __PLUGIN_RIGHTS      "© 2005-2012 Bio"

-#define __PLUGIN_FILE        "Console.dll"

-#define __PLUGIN_SHORTNAME   "Console"

-

-

-#define __PLUGIN_NAME __PLUGIN_SHORTNAME

-#define __PLUGIN_URL "http://miranda-ng.org/"

+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				7

+#define __BUILD_NUM					3

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Console"

+#define __FILENAME					"Console.dll"

+#define __DESCRIPTION 				"Console log window for Miranda."

+#define __AUTHOR					"Bio"

+#define __AUTHOREMAIL				"bio@ktaspb.ru"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2005-2012 Bio"