AVS: folder structure change

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

22 files changed, 41 insertions, 44 deletions

diff --git a/plugins/AVS/avs_10.vcxproj b/plugins/AVS/avs_10.vcxproj
index 2530deed9d..eb442113d1 100644
--- a/plugins/AVS/avs_10.vcxproj
+++ b/plugins/AVS/avs_10.vcxproj
@@ -74,7 +74,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -87,7 +87,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

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

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

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

     </ResourceCompile>

     <Link>

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

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -121,8 +121,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

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

-      <Culture>0x0809</Culture>

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

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

     </ResourceCompile>

     <Link>

@@ -147,7 +146,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

@@ -159,7 +158,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

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

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

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

     </ResourceCompile>

     <Link>

@@ -184,7 +183,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

@@ -196,7 +195,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

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

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

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

     </ResourceCompile>

     <Link>

@@ -217,31 +216,31 @@
     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

-    <ClCompile Include="main.cpp">

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

     <None Include="res\avatar.ico" />

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/AVS/avs_10.vcxproj.filters b/plugins/AVS/avs_10.vcxproj.filters
index 6f6d39f743..e348356ccc 100644
--- a/plugins/AVS/avs_10.vcxproj.filters
+++ b/plugins/AVS/avs_10.vcxproj.filters
@@ -15,42 +15,42 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="acc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="image_utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="mir_thread.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="poll.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="acc.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="image_utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="mir_thread.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="poll.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -60,10 +60,10 @@
     </None>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="avs.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Source Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/AVS/CHANGELOG.AVS b/plugins/AVS/docs/CHANGELOG.AVS
index a673bdff73..a673bdff73 100644
--- a/plugins/AVS/CHANGELOG.AVS
+++ b/plugins/AVS/docs/CHANGELOG.AVS
diff --git a/plugins/AVS/README b/plugins/AVS/docs/README
index d82d1d7fec..d82d1d7fec 100644
--- a/plugins/AVS/README
+++ b/plugins/AVS/docs/README
diff --git a/plugins/AVS/avs-translation.txt b/plugins/AVS/docs/avs-translation.txt
index cd05000e7e..cd05000e7e 100644
--- a/plugins/AVS/avs-translation.txt
+++ b/plugins/AVS/docs/avs-translation.txt
diff --git a/plugins/AVS/license.txt b/plugins/AVS/docs/license.txt
index 7f1161073d..7f1161073d 100644
--- a/plugins/AVS/license.txt
+++ b/plugins/AVS/docs/license.txt
diff --git a/plugins/AVS/avs.rc b/plugins/AVS/res/avs.rc
index e1818ede8d..944b59ba16 100644
--- a/plugins/AVS/avs.rc
+++ b/plugins/AVS/res/avs.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -220,7 +220,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/AVS/version.rc b/plugins/AVS/res/version.rc
index 21312a927c..e2a72f47b6 100644
--- a/plugins/AVS/version.rc
+++ b/plugins/AVS/res/version.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

-#include "version.h"

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

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

 #include "winres.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

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

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/AVS/acc.cpp b/plugins/AVS/src/acc.cpp
index 507245fca8..507245fca8 100644
--- a/plugins/AVS/acc.cpp
+++ b/plugins/AVS/src/acc.cpp
diff --git a/plugins/AVS/acc.h b/plugins/AVS/src/acc.h
index 11b235adc0..11b235adc0 100644
--- a/plugins/AVS/acc.h
+++ b/plugins/AVS/src/acc.h
diff --git a/plugins/AVS/commonheaders.h b/plugins/AVS/src/commonheaders.h
index 5b9d4ee113..5b9d4ee113 100644
--- a/plugins/AVS/commonheaders.h
+++ b/plugins/AVS/src/commonheaders.h
diff --git a/plugins/AVS/image_utils.cpp b/plugins/AVS/src/image_utils.cpp
index 35cb33259a..35cb33259a 100644
--- a/plugins/AVS/image_utils.cpp
+++ b/plugins/AVS/src/image_utils.cpp
diff --git a/plugins/AVS/image_utils.h b/plugins/AVS/src/image_utils.h
index eadb2a3cfe..eadb2a3cfe 100644
--- a/plugins/AVS/image_utils.h
+++ b/plugins/AVS/src/image_utils.h
diff --git a/plugins/AVS/main.cpp b/plugins/AVS/src/main.cpp
index eb690a3b9b..eb690a3b9b 100644
--- a/plugins/AVS/main.cpp
+++ b/plugins/AVS/src/main.cpp
diff --git a/plugins/AVS/mir_thread.cpp b/plugins/AVS/src/mir_thread.cpp
index d12a0c9731..d12a0c9731 100644
--- a/plugins/AVS/mir_thread.cpp
+++ b/plugins/AVS/src/mir_thread.cpp
diff --git a/plugins/AVS/mir_thread.h b/plugins/AVS/src/mir_thread.h
index 0f4f20fe8e..0f4f20fe8e 100644
--- a/plugins/AVS/mir_thread.h
+++ b/plugins/AVS/src/mir_thread.h
diff --git a/plugins/AVS/options.cpp b/plugins/AVS/src/options.cpp
index 58502a9655..58502a9655 100644
--- a/plugins/AVS/options.cpp
+++ b/plugins/AVS/src/options.cpp
diff --git a/plugins/AVS/poll.cpp b/plugins/AVS/src/poll.cpp
index d93ef5309c..d93ef5309c 100644
--- a/plugins/AVS/poll.cpp
+++ b/plugins/AVS/src/poll.cpp
diff --git a/plugins/AVS/poll.h b/plugins/AVS/src/poll.h
index 9761e7360a..9761e7360a 100644
--- a/plugins/AVS/poll.h
+++ b/plugins/AVS/src/poll.h
diff --git a/plugins/AVS/resource.h b/plugins/AVS/src/resource.h
index 2d8ba9add0..2d8ba9add0 100644
--- a/plugins/AVS/resource.h
+++ b/plugins/AVS/src/resource.h
diff --git a/plugins/AVS/version.h b/plugins/AVS/src/version.h
index 826d9fdefb..826d9fdefb 100644
--- a/plugins/AVS/version.h
+++ b/plugins/AVS/src/version.h
diff --git a/plugins/AVS/vc6.rc b/plugins/AVS/vc6.rc
deleted file mode 100644
index 99a8f9da1d..0000000000
--- a/plugins/AVS/vc6.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "avs.rc"

-#include "version.rc"