fixed version info

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

3 files changed, 18 insertions, 62 deletions

diff --git a/plugins/CmdLine/src/CmdLine.cpp b/plugins/CmdLine/src/CmdLine.cpp
index 58e672274e..933b8f7b3d 100644
--- a/plugins/CmdLine/src/CmdLine.cpp
+++ b/plugins/CmdLine/src/CmdLine.cpp
@@ -26,15 +26,15 @@ int hLangpack;
 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	__PLUGIN_DISPLAY_NAME,

-	VERSION,

-	__DESC,

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

 	__AUTHOR,

 	__AUTHOREMAIL,

 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {2f1a117c-3c1b-4c01-89ea-6d8fd85a9b4c}

+	// {2F1A117C-3C1B-4C01-89EA-6D8FD85A9B4C}

 	{0x2f1a117c, 0x3c1b, 0x4c01, {0x89, 0xea, 0x6d, 0x8f, 0xd8, 0x5a, 0x9b, 0x4c}}

 };

 

diff --git a/plugins/CmdLine/src/commonheaders.h b/plugins/CmdLine/src/commonheaders.h
index 0359097b5c..9cd110bc24 100644
--- a/plugins/CmdLine/src/commonheaders.h
+++ b/plugins/CmdLine/src/commonheaders.h
@@ -23,24 +23,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define _CRT_SECURE_NO_WARNINGS

 

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

 #include <windows.h>

 #include <time.h>

 

 #include "newpluginapi.h"

 #include "m_database.h"

-#include "m_system.h"

 #include "m_clist.h"

 #include "m_clui.h"

 #include "m_contacts.h"

 #include "m_langpack.h"

-#include "m_options.h"

 #include "m_protosvc.h"

-#include "m_protocols.h"

 #include "m_popup.h"

-#include "m_utils.h"

 #include "m_message.h"

 #include "m_ignore.h"

 

@@ -60,8 +53,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern char ModuleName[];

 extern HINSTANCE hInstance;

 

-//extern PLUGINLINK *pluginLink;

-

 extern int bUseANSIStrings;

 

 extern int bWaitForUnload;

diff --git a/plugins/CmdLine/src/version.h b/plugins/CmdLine/src/version.h
index 61927e994d..60c98a6dd5 100644
--- a/plugins/CmdLine/src/version.h
+++ b/plugins/CmdLine/src/version.h
@@ -1,49 +1,14 @@
-/*

-CmdLine plugin for Miranda IM

-

-Copyright © 2007-2010 Cristian Libotean

-

-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.

-*/

-

-#ifndef M_CMDLINE_VERSION_H

-#define M_CMDLINE_VERSION_H

-

-#define __MAJOR_VERSION   0

-#define __MINOR_VERSION   0

-#define __RELEASE_NUM     4

-#define __BUILD_NUM       1

-

-#define VERSION PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)

-

-#define __PLUGINVERSION_STRING      __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-#define __PLUGINVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

-#define __STRINGIFY_(x) #x

-#define __STRINGIFY(x) __STRINGIFY_(x)

-#define __VERSION_STRING            __STRINGIFY(__PLUGINVERSION_STRING_DOTS)

-

-#define __DESC                  "This plugin lets you control Miranda from the command line."

-#define __AUTHOR                "Cristian Libotean"

-#define __AUTHOREMAIL           "eblis102@yahoo.com"

-#define __COPYRIGHT             "© 2007-2011 Cristian Libotean"

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

-

-#if defined(WIN64) || defined(_WIN64)

-#define __PLUGIN_DISPLAY_NAME   "Command Line (x64)"

-#else

-#define __PLUGIN_DISPLAY_NAME   "Command Line"

-#endif

-

-#endif //M_CMDLINE_VERSION_H

+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				4

+#define __BUILD_NUM					1

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Command line"

+#define __FILENAME					"CmdLine.dll"

+#define __DESCRIPTION 				"This plugin lets you control Miranda from the command line."

+#define __AUTHOR					"Cristian Libotean"

+#define __AUTHOREMAIL				"eblis102@yahoo.com"

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

+#define __COPYRIGHT					"© 2007-2011 Cristian Libotean"