Db3x_mmap,Db_autobackups: changed folder structure

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

13 files changed, 35 insertions, 38 deletions

diff --git a/plugins/Db_autobackups/db_autobackups_10.vcxproj b/plugins/Db_autobackups/db_autobackups_10.vcxproj
index 5caee2aeb0..8019261e55 100644
--- a/plugins/Db_autobackups/db_autobackups_10.vcxproj
+++ b/plugins/Db_autobackups/db_autobackups_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -90,6 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

@@ -97,10 +98,12 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -110,13 +113,14 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <Optimization>Full</Optimization>

@@ -133,17 +137,20 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <ClCompile>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -155,31 +162,26 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

-    <ClCompile Include="main.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">headers.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">headers.h</PrecompiledHeaderFile>

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

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

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

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

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="icos\backup.ico" />

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Db_autobackups/db_autobackups_10.vcxproj.filters b/plugins/Db_autobackups/db_autobackups_10.vcxproj.filters
index 52d562b3c9..ed336c2e02 100644
--- a/plugins/Db_autobackups/db_autobackups_10.vcxproj.filters
+++ b/plugins/Db_autobackups/db_autobackups_10.vcxproj.filters
@@ -15,40 +15,35 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="backup.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="headers.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="icos\backup.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="db_autobackups.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/Db_autobackups/db_autobackups-translation.txt b/plugins/Db_autobackups/docs/db_autobackups-translation.txt
index c9281a611a..c9281a611a 100644
--- a/plugins/Db_autobackups/db_autobackups-translation.txt
+++ b/plugins/Db_autobackups/docs/db_autobackups-translation.txt
diff --git a/plugins/Db_autobackups/icos/backup.ico b/plugins/Db_autobackups/res/backup.ico
index 2bd78218d8..2bd78218d8 100644
--- a/plugins/Db_autobackups/icos/backup.ico
+++ b/plugins/Db_autobackups/res/backup.ico
diff --git a/plugins/Db_autobackups/db_autobackups.rc b/plugins/Db_autobackups/res/db_autobackups.rc
index 714f4a3505..2fb8964153 100644
--- a/plugins/Db_autobackups/db_autobackups.rc
+++ b/plugins/Db_autobackups/res/db_autobackups.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -63,7 +63,7 @@ END
 

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

 // remains consistent on all systems.

-IDI_ICON1               ICON                    "icos\\backup.ico"

+IDI_ICON1               ICON                    "backup.ico"

 #endif    // Russian resources

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

 

@@ -149,7 +149,7 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/Db_autobackups/version.rc b/plugins/Db_autobackups/res/version.rc
index 542d0a8f6c..30fac5ce35 100644
--- a/plugins/Db_autobackups/version.rc
+++ b/plugins/Db_autobackups/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include <windows.h>

-#include "version.h"

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

 

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

 //

diff --git a/plugins/Db_autobackups/backup.cpp b/plugins/Db_autobackups/src/backup.cpp
index a6b78dace2..a6b78dace2 100644
--- a/plugins/Db_autobackups/backup.cpp
+++ b/plugins/Db_autobackups/src/backup.cpp
diff --git a/plugins/Db_autobackups/headers.h b/plugins/Db_autobackups/src/headers.h
index eab2ffc667..eab2ffc667 100644
--- a/plugins/Db_autobackups/headers.h
+++ b/plugins/Db_autobackups/src/headers.h
diff --git a/plugins/Db_autobackups/main.cpp b/plugins/Db_autobackups/src/main.cpp
index f771261202..f771261202 100644
--- a/plugins/Db_autobackups/main.cpp
+++ b/plugins/Db_autobackups/src/main.cpp
diff --git a/plugins/Db_autobackups/options.cpp b/plugins/Db_autobackups/src/options.cpp
index ef94ab8872..ef94ab8872 100644
--- a/plugins/Db_autobackups/options.cpp
+++ b/plugins/Db_autobackups/src/options.cpp
diff --git a/plugins/Db_autobackups/options.h b/plugins/Db_autobackups/src/options.h
index 240fc9566e..240fc9566e 100644
--- a/plugins/Db_autobackups/options.h
+++ b/plugins/Db_autobackups/src/options.h
diff --git a/plugins/Db_autobackups/resource.h b/plugins/Db_autobackups/src/resource.h
index fe3f28621c..fe3f28621c 100644
--- a/plugins/Db_autobackups/resource.h
+++ b/plugins/Db_autobackups/src/resource.h
diff --git a/plugins/Db_autobackups/version.h b/plugins/Db_autobackups/src/version.h
index e7151dfccb..e7151dfccb 100644
--- a/plugins/Db_autobackups/version.h
+++ b/plugins/Db_autobackups/src/version.h