AuthState:

changed folder structure

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

14 files changed, 35 insertions, 28 deletions

diff --git a/plugins/AuthState/authstate_10.vcxproj b/plugins/AuthState/authstate_10.vcxproj
index 4147eef3f0..cee8ba568a 100644
--- a/plugins/AuthState/authstate_10.vcxproj
+++ b/plugins/AuthState/authstate_10.vcxproj
@@ -90,6 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

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

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

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

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

@@ -165,30 +168,31 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="icons\auth.ico" />

-    <None Include="icons\authgrant.ico" />

-    <None Include="icons\grant.ico" />

+    <None Include="res\auth.ico" />

+    <None Include="res\authgrant.ico" />

+    <None Include="res\grant.ico" />

     <None Include="docs\authstate-readme.txt" />

-    <None Include="docs\authstate-translate.txt" />

+    <None Include="docs\authstate-translation.txt" />

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/AuthState/authstate_10.vcxproj.filters b/plugins/AuthState/authstate_10.vcxproj.filters
index c045a6a4b2..72395ac048 100644
--- a/plugins/AuthState/authstate_10.vcxproj.filters
+++ b/plugins/AuthState/authstate_10.vcxproj.filters
@@ -18,46 +18,46 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

+    <ClInclude Include="src\commonheaders.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="icons\auth.ico">

+    <None Include="res\auth.ico">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="icons\authgrant.ico">

+    <None Include="res\authgrant.ico">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="icons\grant.ico">

+    <None Include="res\grant.ico">

       <Filter>Resource Files</Filter>

     </None>

     <None Include="docs\authstate-readme.txt">

       <Filter>Docs</Filter>

     </None>

-    <None Include="docs\authstate-translate.txt">

+    <None Include="docs\authstate-translation.txt">

       <Filter>Docs</Filter>

     </None>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="authstate.rc">

+    <ResourceCompile Include="res\authstate.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/AuthState/authstate_10.vcxproj.user b/plugins/AuthState/authstate_10.vcxproj.user
new file mode 100644
index 0000000000..695b5c78b9
--- /dev/null
+++ b/plugins/AuthState/authstate_10.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+</Project>
\ No newline at end of file
diff --git a/plugins/AuthState/authstate-translation.txt b/plugins/AuthState/docs/authstate-translation.txt
index 86733c7b88..86733c7b88 100644
--- a/plugins/AuthState/authstate-translation.txt
+++ b/plugins/AuthState/docs/authstate-translation.txt
diff --git a/plugins/AuthState/icons/auth.ico b/plugins/AuthState/res/auth.ico
index 01cb6f019f..01cb6f019f 100644
--- a/plugins/AuthState/icons/auth.ico
+++ b/plugins/AuthState/res/auth.ico
diff --git a/plugins/AuthState/icons/authgrant.ico b/plugins/AuthState/res/authgrant.ico
index 3f15a64183..3f15a64183 100644
--- a/plugins/AuthState/icons/authgrant.ico
+++ b/plugins/AuthState/res/authgrant.ico
diff --git a/plugins/AuthState/authstate.rc b/plugins/AuthState/res/authstate.rc
index 0bed71895b..92e9024d9f 100644
--- a/plugins/AuthState/authstate.rc
+++ b/plugins/AuthState/res/authstate.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -28,9 +28,9 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 

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

 // remains consistent on all systems.

-IDI_AUTH                ICON                    "icons\\auth.ico"

-IDI_GRANT               ICON                    "icons\\grant.ico"

-IDI_AUTHGRANT           ICON                    "icons\\authgrant.ico"

+IDI_AUTH                ICON                    "auth.ico"

+IDI_GRANT               ICON                    "grant.ico"

+IDI_AUTHGRANT           ICON                    "authgrant.ico"

 #endif    // Ukrainian resources

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

 

@@ -52,7 +52,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/AuthState/icons/grant.ico b/plugins/AuthState/res/grant.ico
index 89ce6012ed..89ce6012ed 100644
--- a/plugins/AuthState/icons/grant.ico
+++ b/plugins/AuthState/res/grant.ico
diff --git a/plugins/AuthState/version.rc b/plugins/AuthState/res/version.rc
index 2b1aaa9768..2325cd192f 100644
--- a/plugins/AuthState/version.rc
+++ b/plugins/AuthState/res/version.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.

 //

 #include "afxres.h"

-#include "version.h"

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

 

 #ifdef _WIN32

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

diff --git a/plugins/AuthState/commonheaders.h b/plugins/AuthState/src/commonheaders.h
index beead07b56..beead07b56 100644
--- a/plugins/AuthState/commonheaders.h
+++ b/plugins/AuthState/src/commonheaders.h
diff --git a/plugins/AuthState/main.cpp b/plugins/AuthState/src/main.cpp
index 0f168c0fe1..0f168c0fe1 100644
--- a/plugins/AuthState/main.cpp
+++ b/plugins/AuthState/src/main.cpp
diff --git a/plugins/AuthState/options.cpp b/plugins/AuthState/src/options.cpp
index d2248d9e44..d2248d9e44 100644
--- a/plugins/AuthState/options.cpp
+++ b/plugins/AuthState/src/options.cpp
diff --git a/plugins/AuthState/resource.h b/plugins/AuthState/src/resource.h
index 49c8f2fb6a..49c8f2fb6a 100644
--- a/plugins/AuthState/resource.h
+++ b/plugins/AuthState/src/resource.h
diff --git a/plugins/AuthState/version.h b/plugins/AuthState/src/version.h
index 3c39613d72..3c39613d72 100644
--- a/plugins/AuthState/version.h
+++ b/plugins/AuthState/src/version.h