ContactsPlus, CountryFlags, CrashDumper: changed folder structure

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

15 files changed, 34 insertions, 49 deletions

diff --git a/plugins/CountryFlags/countryflags-translation.txt b/plugins/CountryFlags/docs/countryflags-translation.txt
index 6643235c2a..6643235c2a 100644
--- a/plugins/CountryFlags/countryflags-translation.txt
+++ b/plugins/CountryFlags/docs/countryflags-translation.txt
diff --git a/plugins/CountryFlags/flags.vcxproj b/plugins/CountryFlags/flags.vcxproj
index 62dd7df548..ef1c334390 100644
--- a/plugins/CountryFlags/flags.vcxproj
+++ b/plugins/CountryFlags/flags.vcxproj
@@ -82,7 +82,7 @@
     </ClCompile>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

       <LinkDLL>true</LinkDLL>

@@ -107,7 +107,7 @@
     </ClCompile>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

       <LinkDLL>true</LinkDLL>

@@ -133,7 +133,7 @@
     </ClCompile>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

       <LinkDLL>true</LinkDLL>

@@ -161,7 +161,7 @@
     </ClCompile>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

       <LinkDLL>true</LinkDLL>

@@ -177,18 +177,18 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="countrylistext.cpp" />

-    <ClCompile Include="extraimg.cpp" />

-    <ClCompile Include="huffman.cpp" />

-    <ClCompile Include="icons.cpp" />

-    <ClCompile Include="ip2country.cpp" />

-    <ClCompile Include="main.cpp" />

-    <ClCompile Include="utils.cpp" />

+    <ClCompile Include="src\countrylistext.cpp" />

+    <ClCompile Include="src\extraimg.cpp" />

+    <ClCompile Include="src\huffman.cpp" />

+    <ClCompile Include="src\icons.cpp" />

+    <ClCompile Include="src\ip2country.cpp" />

+    <ClCompile Include="src\main.cpp" />

+    <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="flags.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="version.h" />

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

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

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

   </ItemGroup>

   <ItemGroup>

     <CustomBuild Include="res\flags.bmp" />

@@ -203,7 +203,8 @@
     <CustomBuild Include="docs\License_Appendix.txt" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/CountryFlags/flags.vcxproj.filters b/plugins/CountryFlags/flags.vcxproj.filters
index 1d3dd91efb..9d5d5b9f0f 100644
--- a/plugins/CountryFlags/flags.vcxproj.filters
+++ b/plugins/CountryFlags/flags.vcxproj.filters
@@ -19,41 +19,44 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="countrylistext.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="extraimg.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="huffman.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="icons.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ip2country.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="flags.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Resource Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Resource Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/CountryFlags/resource.rc b/plugins/CountryFlags/res/resource.rc
index eba35cb8e3..55e9f5e20d 100644
--- a/plugins/CountryFlags/resource.rc
+++ b/plugins/CountryFlags/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -38,12 +38,6 @@ BEGIN
     "\0"

 END

 

-3 TEXTINCLUDE MOVEABLE PURE 

-BEGIN

-    "#include ""version.rc""\r\n"

-    "\0"

-END

-

 #endif    // APSTUDIO_INVOKED

 

 

@@ -52,14 +46,14 @@ END
 // Bitmap

 //

 

-IDB_FLAGS               BITMAP  DISCARDABLE     "res/flags.bmp"

+IDB_FLAGS               BITMAP     "flags.bmp"

 

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

 //

 // BIN

 //

 

-IDR_IPTOCOUNTRY         BIN     DISCARDABLE     "res/ip-to-country.bin"

+IDR_IPTOCOUNTRY         BIN     "ip-to-country.bin"

 

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

 //

@@ -117,11 +111,6 @@ END
 

 

 #ifndef APSTUDIO_INVOKED

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

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-#include "version.rc"

 

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

 #endif    // not APSTUDIO_INVOKED

diff --git a/plugins/CountryFlags/version.rc b/plugins/CountryFlags/res/version.rc
index a381dfefd2..73ff5ab9ea 100644
--- a/plugins/CountryFlags/version.rc
+++ b/plugins/CountryFlags/res/version.rc
@@ -2,9 +2,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#ifndef _MAC 

-

-#include <version.h>

+#include <..\src\version.h>

 

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

 //                                                                            

@@ -43,9 +41,3 @@ BEGIN
         VALUE "Translation", 0x0, 1200

     END

 END

-                                                                             

-#endif    // !_MAC                 

-                                   

-                                                                        

-                               

-                                                                              

diff --git a/plugins/CountryFlags/countrylistext.cpp b/plugins/CountryFlags/src/countrylistext.cpp
index 95f692b30b..95f692b30b 100644
--- a/plugins/CountryFlags/countrylistext.cpp
+++ b/plugins/CountryFlags/src/countrylistext.cpp
diff --git a/plugins/CountryFlags/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index f019827e21..f019827e21 100644
--- a/plugins/CountryFlags/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
diff --git a/plugins/CountryFlags/flags.h b/plugins/CountryFlags/src/flags.h
index c91876bd97..c91876bd97 100644
--- a/plugins/CountryFlags/flags.h
+++ b/plugins/CountryFlags/src/flags.h
diff --git a/plugins/CountryFlags/huffman.cpp b/plugins/CountryFlags/src/huffman.cpp
index c460e9a66e..c460e9a66e 100644
--- a/plugins/CountryFlags/huffman.cpp
+++ b/plugins/CountryFlags/src/huffman.cpp
diff --git a/plugins/CountryFlags/icons.cpp b/plugins/CountryFlags/src/icons.cpp
index 3b456a4d11..3b456a4d11 100644
--- a/plugins/CountryFlags/icons.cpp
+++ b/plugins/CountryFlags/src/icons.cpp
diff --git a/plugins/CountryFlags/ip2country.cpp b/plugins/CountryFlags/src/ip2country.cpp
index 12f3406a11..12f3406a11 100644
--- a/plugins/CountryFlags/ip2country.cpp
+++ b/plugins/CountryFlags/src/ip2country.cpp
diff --git a/plugins/CountryFlags/main.cpp b/plugins/CountryFlags/src/main.cpp
index 462672292a..462672292a 100644
--- a/plugins/CountryFlags/main.cpp
+++ b/plugins/CountryFlags/src/main.cpp
diff --git a/plugins/CountryFlags/resource.h b/plugins/CountryFlags/src/resource.h
index a2cd0496d8..a2cd0496d8 100644
--- a/plugins/CountryFlags/resource.h
+++ b/plugins/CountryFlags/src/resource.h
diff --git a/plugins/CountryFlags/utils.cpp b/plugins/CountryFlags/src/utils.cpp
index b55e52e5cf..b55e52e5cf 100644
--- a/plugins/CountryFlags/utils.cpp
+++ b/plugins/CountryFlags/src/utils.cpp
diff --git a/plugins/CountryFlags/version.h b/plugins/CountryFlags/src/version.h
index a778ed0026..a778ed0026 100644
--- a/plugins/CountryFlags/version.h
+++ b/plugins/CountryFlags/src/version.h