3 files changed, 13 insertions, 80 deletions
diff --git a/plugins/CmdLine/MimCmd/res/version.rc b/plugins/CmdLine/MimCmd/res/version.rc
index a76ba93541..5bfbab4754 100644
--- a/plugins/CmdLine/MimCmd/res/version.rc
+++ b/plugins/CmdLine/MimCmd/res/version.rc
@@ -4,61 +4,12 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "..\..\src\version.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
 #include "afxres.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
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "..\\src\\resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
+#include "..\src\version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION __PLUGINVERSION_STRING
- PRODUCTVERSION __PLUGINVERSION_STRING
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,38 +17,22 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGS 0x0L
 #endif
  FILEOS 0x4L
- FILETYPE 0x2L
+ FILETYPE 0x0L
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "000004b0"
         BEGIN
-            VALUE "Author", __AUTHOR
-            VALUE "FileDescription", __DESC
-            VALUE "FileVersion", __VERSION_STRING
-            VALUE "InternalName", __PLUGIN_DISPLAY_NAME
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
             VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x0, 1200
     END
 END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/CmdLine/MimCmd/src/MimCmd.cpp b/plugins/CmdLine/MimCmd/src/MimCmd.cpp
index 07daf85a0c..94f614a20c 100644
--- a/plugins/CmdLine/MimCmd/src/MimCmd.cpp
+++ b/plugins/CmdLine/MimCmd/src/MimCmd.cpp
@@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "common.h"
-#include "..\..\src\utils.h"
-#include "..\..\src\version.h"
 
 int hLangpack = 0;
 
@@ -71,7 +69,7 @@ void ShowVersion()
 	char name[128];
 	char message[1024];
 	GetProgramName(name, sizeof(name));
-	mir_snprintf(message, sizeof(message), Translate("%s version %s"), name, __VERSION_STRING);
+	mir_snprintf(message, sizeof(message), Translate("%s version %s"), name, __FILEVERSION_STRING);
 
 	lpprintf("%s\n", message);
 }
diff --git a/plugins/CmdLine/MimCmd/src/common.h b/plugins/CmdLine/MimCmd/src/common.h
index 0086237671..4fb16a914d 100644
--- a/plugins/CmdLine/MimCmd/src/common.h
+++ b/plugins/CmdLine/MimCmd/src/common.h
@@ -22,15 +22,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
 #include <windows.h>
-#include <string.h>
 
 #define NO_MIMCMD_COMMANDS
 
-#include <m_system.h>
 #include <newpluginapi.h>
 #include <m_langpack.h>
 
 #include "..\..\src\mimcmd_ipc.h"
+#include "..\..\src\version.h"
+#include "..\..\src\utils.h"
 #include "commands.h"
 
 int lpprintf(const char *format, ...);