From a7073a93e7f36554426cccb9fa635f71fad359bf Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Fri, 13 Jul 2012 07:00:57 +0000
Subject: ClientChangeNotify: compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@936 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 .../ClientChangeNotify/ClientChangeNotify.vcxproj  | 10 ++---
 .../ClientChangeNotify.vcxproj.filters             |  2 +-
 plugins/ClientChangeNotify/res/Resources.rc        | 10 -----
 plugins/ClientChangeNotify/res/Resources.rc2       | 50 ----------------------
 plugins/ClientChangeNotify/res/Version.rc          | 42 ++++++++++++++++++
 5 files changed, 48 insertions(+), 66 deletions(-)
 delete mode 100644 plugins/ClientChangeNotify/res/Resources.rc2
 create mode 100644 plugins/ClientChangeNotify/res/Version.rc

(limited to 'plugins/ClientChangeNotify')

diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
index c1e90d0cc9..945fbf4807 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
@@ -77,7 +77,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -99,7 +99,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -124,7 +124,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
@@ -152,7 +152,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
@@ -191,7 +191,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\Resources.rc" />
-    <ResourceCompile Include="res\Resources.rc2" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="docs\ccn_readme.txt" />
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
index 8fc754f832..6dcefba978 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
@@ -69,7 +69,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\Resources.rc2">
+    <None Include="res\Version.rc">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="docs\ccn_readme.txt">
diff --git a/plugins/ClientChangeNotify/res/Resources.rc b/plugins/ClientChangeNotify/res/Resources.rc
index 2f76a307d9..8c8b3112d8 100644
--- a/plugins/ClientChangeNotify/res/Resources.rc
+++ b/plugins/ClientChangeNotify/res/Resources.rc
@@ -94,7 +94,6 @@ BEGIN
     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
     "LANGUAGE 9, 1\r\n"
     "#pragma code_page(1252)\r\n"
-    "#include ""Resources.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#endif\r\n"
     "\0"
 END
@@ -187,15 +186,6 @@ END
 
 
 #ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#include "Resources.rc2"  // non-Microsoft Visual C++ edited resources
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
diff --git a/plugins/ClientChangeNotify/res/Resources.rc2 b/plugins/ClientChangeNotify/res/Resources.rc2
deleted file mode 100644
index ecb7a2de3a..0000000000
--- a/plugins/ClientChangeNotify/res/Resources.rc2
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// RESOURCES.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Add manually edited resources here...
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#include "..\src\VersionNo.h"
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x21L
-#else
- FILEFLAGS 0x20L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Deathdemon"
-            VALUE "FileDescription", "ClientChangeNotify plugin for Miranda IM."
-            VALUE "LegalCopyright", "© 2006-2008 Chervov Dmitry"
-            VALUE "InternalName", "ClientChangeNotify"
-            VALUE "OriginalFilename", "ClientChangeNotifyW.dll"
-            VALUE "ProductName", "ClientChangeNotify (Unicode)"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ClientChangeNotify/res/Version.rc b/plugins/ClientChangeNotify/res/Version.rc
new file mode 100644
index 0000000000..e960944698
--- /dev/null
+++ b/plugins/ClientChangeNotify/res/Version.rc
@@ -0,0 +1,42 @@
+// 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\VersionNo.h"
+
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#endif //_WIN32
+
+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", "ClientChangeNotify plugin for Miranda IM."
+            VALUE "InternalName", "ClientChangeNotify"
+            VALUE "LegalCopyright", "© 2006-2008 Chervov Dmitry"
+            VALUE "OriginalFilename", "ClientChangeNotify.dll"
+            VALUE "ProductName", "ClientChangeNotify"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
-- 
cgit v1.2.3