FirstRun, FlashAvatars, FloatingContacts: changed folder structure

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

13 files changed, 23 insertions, 24 deletions

diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj b/plugins/FlashAvatars/FlashAvatars_10.vcxproj
index a8ec355ef9..bd38b53739 100644
--- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj
+++ b/plugins/FlashAvatars/FlashAvatars_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -100,9 +100,8 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

@@ -126,7 +125,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

@@ -138,7 +137,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -155,7 +153,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

@@ -167,7 +165,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -180,20 +177,20 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="cflash.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters b/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters
index fca988d88b..04d05afcb8 100644
--- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters
+++ b/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters
@@ -11,27 +11,27 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="criticalsection.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="stdafx.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="TigerHash.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="FlashAvatars.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/FlashAvatars/changelog.txt b/plugins/FlashAvatars/docs/changelog.txt
index 79a9b5a972..79a9b5a972 100644
--- a/plugins/FlashAvatars/changelog.txt
+++ b/plugins/FlashAvatars/docs/changelog.txt
diff --git a/plugins/FlashAvatars/flashavatars-translation.txt b/plugins/FlashAvatars/docs/flashavatars-translation.txt
index bc104de723..bc104de723 100644
--- a/plugins/FlashAvatars/flashavatars-translation.txt
+++ b/plugins/FlashAvatars/docs/flashavatars-translation.txt
diff --git a/plugins/FlashAvatars/FlashAvatars.rc b/plugins/FlashAvatars/res/FlashAvatars.rc
index 0fe762aab3..2282ceecf7 100644
--- a/plugins/FlashAvatars/FlashAvatars.rc
+++ b/plugins/FlashAvatars/res/FlashAvatars.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

diff --git a/plugins/FlashAvatars/TigerHash.cpp b/plugins/FlashAvatars/src/TigerHash.cpp
index 406676f0a5..406676f0a5 100644
--- a/plugins/FlashAvatars/TigerHash.cpp
+++ b/plugins/FlashAvatars/src/TigerHash.cpp
diff --git a/plugins/FlashAvatars/TigerHash.h b/plugins/FlashAvatars/src/TigerHash.h
index 8704ed552a..8704ed552a 100644
--- a/plugins/FlashAvatars/TigerHash.h
+++ b/plugins/FlashAvatars/src/TigerHash.h
diff --git a/plugins/FlashAvatars/cflash.cpp b/plugins/FlashAvatars/src/cflash.cpp
index 2d101cbbe6..2d101cbbe6 100644
--- a/plugins/FlashAvatars/cflash.cpp
+++ b/plugins/FlashAvatars/src/cflash.cpp
diff --git a/plugins/FlashAvatars/criticalsection.h b/plugins/FlashAvatars/src/criticalsection.h
index 6524b49559..6524b49559 100644
--- a/plugins/FlashAvatars/criticalsection.h
+++ b/plugins/FlashAvatars/src/criticalsection.h
diff --git a/plugins/FlashAvatars/flash.tlb b/plugins/FlashAvatars/src/flash.tlb
index 489608c08b..489608c08b 100644
--- a/plugins/FlashAvatars/flash.tlb
+++ b/plugins/FlashAvatars/src/flash.tlb
diff --git a/plugins/FlashAvatars/resource.h b/plugins/FlashAvatars/src/resource.h
index cbedd28229..cbedd28229 100644
--- a/plugins/FlashAvatars/resource.h
+++ b/plugins/FlashAvatars/src/resource.h
diff --git a/plugins/FlashAvatars/stdafx.cpp b/plugins/FlashAvatars/src/stdafx.cpp
index a70d8726c6..a70d8726c6 100644
--- a/plugins/FlashAvatars/stdafx.cpp
+++ b/plugins/FlashAvatars/src/stdafx.cpp
diff --git a/plugins/FlashAvatars/stdafx.h b/plugins/FlashAvatars/src/stdafx.h
index 6113744e85..a5df8294e9 100644
--- a/plugins/FlashAvatars/stdafx.h
+++ b/plugins/FlashAvatars/src/stdafx.h
@@ -2,6 +2,8 @@
 // or project specific include files that are used frequently, but

 // are changed infrequently

 

+#define _CRT_SECURE_NO_WARNINGS

+

 #pragma once

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define BZ_NO_STDIO