added precompiled header

added version info

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

10 files changed, 149 insertions, 24 deletions

diff --git a/plugins/Restart/Restart_10.vcxproj b/plugins/Restart/Restart_10.vcxproj
index ed873dcd4d..383d0c044c 100644
--- a/plugins/Restart/Restart_10.vcxproj
+++ b/plugins/Restart/Restart_10.vcxproj
@@ -81,6 +81,8 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -105,6 +107,8 @@
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -130,6 +134,8 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -158,6 +164,8 @@
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -176,13 +184,19 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClInclude Include="src\Common.h" />

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

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

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

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Restart.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Restart/Restart_10.vcxproj.filters b/plugins/Restart/Restart_10.vcxproj.filters
index 9dc9aa73c4..5fb1738b7b 100644
--- a/plugins/Restart/Restart_10.vcxproj.filters
+++ b/plugins/Restart/Restart_10.vcxproj.filters
@@ -15,15 +15,27 @@
     <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Common.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Restart.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Restart/Restart_11.vcxproj b/plugins/Restart/Restart_11.vcxproj
index d4f32b994e..a4db896975 100644
--- a/plugins/Restart/Restart_11.vcxproj
+++ b/plugins/Restart/Restart_11.vcxproj
@@ -85,6 +85,8 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -109,6 +111,8 @@
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -134,6 +138,8 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -162,6 +168,8 @@
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -180,13 +188,19 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClInclude Include="src\Common.h" />

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

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

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

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Restart.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Restart/Restart_11.vcxproj.filters b/plugins/Restart/Restart_11.vcxproj.filters
index 9dc9aa73c4..5fb1738b7b 100644
--- a/plugins/Restart/Restart_11.vcxproj.filters
+++ b/plugins/Restart/Restart_11.vcxproj.filters
@@ -15,15 +15,27 @@
     <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Common.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Restart.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Restart/res/Restart.rc b/plugins/Restart/res/Restart.rc
index 6153050f66..80bb46c752 100644
--- a/plugins/Restart/res/Restart.rc
+++ b/plugins/Restart/res/Restart.rc
@@ -27,18 +27,18 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE MOVEABLE PURE 

+1 TEXTINCLUDE

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

-2 TEXTINCLUDE MOVEABLE PURE 

+2 TEXTINCLUDE

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE MOVEABLE PURE 

+3 TEXTINCLUDE

 BEGIN

     "\r\n"

     "\0"

@@ -54,7 +54,7 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_RESTARTICON         ICON    DISCARDABLE     "restart.ico"

+IDI_RESTARTICON         ICON         "restart.ico"

 #endif    // Russian resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/Restart/res/Version.rc b/plugins/Restart/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/Restart/res/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

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

+

+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/Restart/src/Common.h b/plugins/Restart/src/Common.h
new file mode 100644
index 0000000000..9a508effa5
--- /dev/null
+++ b/plugins/Restart/src/Common.h
@@ -0,0 +1,13 @@
+#define _CRT_SECURE_NO_WARNINGS

+#define WIN32_LEAN_AND_MEAN

+

+#include <windows.h>

+

+#include <newpluginapi.h>

+#include <m_langpack.h>

+#include <m_genmenu.h>

+#include <m_utils.h>

+#include <win2k.h>

+

+#include "resource.h"

+#include "Version.h"

diff --git a/plugins/Restart/src/Version.h b/plugins/Restart/src/Version.h
new file mode 100644
index 0000000000..4f0aac51ef
--- /dev/null
+++ b/plugins/Restart/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				6

+#define __BUILD_NUM					0

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Restart"

+#define __FILENAME					"Restart.dll"

+#define __DESCRIPTION 				"Adds Restart menu item."

+#define __AUTHOR					"eugene.nv"

+#define __AUTHOREMAIL				"ep@eugn.me"

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

+#define __COPYRIGHT					"© 2008 - 2013 eugene.nv"

diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp
index a99d9ba27a..50dfa35e4c 100644
--- a/plugins/Restart/src/restart.cpp
+++ b/plugins/Restart/src/restart.cpp
@@ -1,14 +1,4 @@
-#include <windows.h>

-#include <newpluginapi.h>

-#include <m_clist.h>

-#include <m_skin.h>

-#include <m_icolib.h>

-#include <m_langpack.h>

-#include <m_system.h>

-#include <m_genmenu.h>

-#include <m_utils.h>

-#include <win2k.h>

-#include "resource.h"

+#include "Common.h"

 

 HINSTANCE hInst;

 int hLangpack;

@@ -16,15 +6,15 @@ HANDLE hRestartMe;
 

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

-	"Restart plugin",

-	PLUGIN_MAKE_VERSION(0,0,6,0),

-	"Adds Restart menu item.",

-	"eugene.nv",

-	"ep@eugn.me",

-	"© 2008 - 2013 eugene.nv",

-	"http://miranda-ng.org",

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {61BEDF3A-0CC2-41a3-B980-BB9393368935}

+	// {61BEDF3A-0CC2-41A3-B980-BB9393368935}

 	{0x61bedf3a, 0xcc2, 0x41a3, {0xb9, 0x80, 0xbb, 0x93, 0x93, 0x36, 0x89, 0x35}}

 };

 

diff --git a/plugins/Restart/src/stdafx.cpp b/plugins/Restart/src/stdafx.cpp
new file mode 100644
index 0000000000..1976d867da
--- /dev/null
+++ b/plugins/Restart/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*

+Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)

+

+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 version 2

+of the License.

+

+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, see <http://www.gnu.org/licenses/>.

+*/

+

+#include "common.h"
\ No newline at end of file