version info standartization

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

5 files changed, 10 insertions, 62 deletions

diff --git a/plugins/AssocMgr/assocmgr.vcxproj b/plugins/AssocMgr/assocmgr.vcxproj
index 1e478e249a..d20895a389 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj
+++ b/plugins/AssocMgr/assocmgr.vcxproj
@@ -209,17 +209,8 @@
     <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="res\miranda.ico" />

-    <CustomBuild Include="res\mirandafile.ico" />

-    <CustomBuild Include="docs\AssocMgr-Developer.txt" />

-    <CustomBuild Include="docs\AssocMgr-License.txt" />

-    <CustomBuild Include="docs\AssocMgr-Readme.txt" />

-    <CustomBuild Include="docs\AssocMgr-Translation.txt" />

-    <CustomBuild Include="docs\Info_Src.txt" />

-    <CustomBuild Include="docs\License_Appendix.txt" />

-  </ItemGroup>

-  <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/AssocMgr/assocmgr.vcxproj.filters b/plugins/AssocMgr/assocmgr.vcxproj.filters
index 85dfe0caf0..6d23c19728 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj.filters
+++ b/plugins/AssocMgr/assocmgr.vcxproj.filters
@@ -13,10 +13,6 @@
       <UniqueIdentifier>{db2d32fd-f303-490e-bc40-ca67fd6fee73}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="Documentation">

-      <UniqueIdentifier>{6f8e30e0-bc03-46e7-b039-e0fbd019afb2}</UniqueIdentifier>

-      <Extensions>txt</Extensions>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

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

@@ -58,41 +54,18 @@
       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\version.h">

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="res\miranda.ico">

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

       <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\mirandafile.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-Developer.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-License.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-Readme.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-Translation.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\Info_Src.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\License_Appendix.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/AssocMgr/res/resource.rc b/plugins/AssocMgr/res/resource.rc
index 3c878d0540..ca7262ebf9 100644
--- a/plugins/AssocMgr/res/resource.rc
+++ b/plugins/AssocMgr/res/resource.rc
@@ -95,17 +95,4 @@ END
 #endif    // APSTUDIO_INVOKED

 

 #endif    // Englisch (GB) resources

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

-

-

-

-#ifndef APSTUDIO_INVOKED

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

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-#include "version.rc"

-

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

-#endif    // not APSTUDIO_INVOKED

-

+/////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/plugins/AssocMgr/res/version.rc b/plugins/AssocMgr/res/version.rc
index b8fb57b0de..cee33c8390 100644
--- a/plugins/AssocMgr/res/version.rc
+++ b/plugins/AssocMgr/res/version.rc
@@ -1,14 +1,11 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

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

 #endif //APSTUDIO_INVOKED

 

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

 

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

-//

-// Version

-//

-

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp
index fdb9e09a61..4af0e5c6e0 100644
--- a/plugins/AssocMgr/src/main.cpp
+++ b/plugins/AssocMgr/src/main.cpp
@@ -26,7 +26,7 @@ HINSTANCE hInst;
 static HANDLE hHookModulesLoaded;

 int hLangpack;

 

-PLUGININFOEX pluginInfo={

+PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -37,7 +37,7 @@ PLUGININFOEX pluginInfo={
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {52685CD7-0EC7-44c1-A1A6-381612418202}

-	{0x52685cd7,0xec7,0x44c1,{0xa1,0xa6,0x38,0x16,0x12,0x41,0x82,0x2}}

+	{0x52685cd7, 0xec7, 0x44c1, {0xa1, 0xa6, 0x38, 0x16, 0x12, 0x41, 0x82, 0x2}}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)