diff options
| -rw-r--r-- | 1.bat | 1 | ||||
| -rw-r--r-- | plugins/FirstRun/FirstRun.vcxproj | 5 | ||||
| -rw-r--r-- | plugins/FirstRun/FirstRun.vcxproj.filters | 8 | ||||
| -rw-r--r-- | plugins/FirstRun/docs/firstrun-translation.txt (renamed from plugins/FirstRun/firstrun-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/FirstRun/src/commonheaders.h (renamed from plugins/FirstRun/commonheaders.h) | 0 | ||||
| -rw-r--r-- | plugins/FirstRun/src/main.cpp (renamed from plugins/FirstRun/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/FlashAvatars_10.vcxproj | 27 | ||||
| -rw-r--r-- | plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters | 16 | ||||
| -rw-r--r-- | plugins/FlashAvatars/docs/changelog.txt (renamed from plugins/FlashAvatars/changelog.txt) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/docs/flashavatars-translation.txt (renamed from plugins/FlashAvatars/flashavatars-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/res/FlashAvatars.rc (renamed from plugins/FlashAvatars/FlashAvatars.rc) | 2 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/TigerHash.cpp (renamed from plugins/FlashAvatars/TigerHash.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/TigerHash.h (renamed from plugins/FlashAvatars/TigerHash.h) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/cflash.cpp (renamed from plugins/FlashAvatars/cflash.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/criticalsection.h (renamed from plugins/FlashAvatars/criticalsection.h) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/flash.tlb (renamed from plugins/FlashAvatars/flash.tlb) | bin | 14160 -> 14160 bytes | |||
| -rw-r--r-- | plugins/FlashAvatars/src/resource.h (renamed from plugins/FlashAvatars/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/stdafx.cpp (renamed from plugins/FlashAvatars/stdafx.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/stdafx.h (renamed from plugins/FlashAvatars/stdafx.h) | 2 | ||||
| -rw-r--r-- | plugins/FloatingContacts/FltCont_10.vcxproj | 32 | ||||
| -rw-r--r-- | plugins/FloatingContacts/FltCont_10.vcxproj.filters | 36 | ||||
| -rw-r--r-- | plugins/FloatingContacts/docs/floatingcontacts-translation.txt (renamed from plugins/FloatingContacts/floatingcontacts-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/res/fltcnt.rc (renamed from plugins/FloatingContacts/fltcnt.rc) | 2 | ||||
| -rw-r--r-- | plugins/FloatingContacts/res/hide.ico (renamed from plugins/FloatingContacts/hide.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/FloatingContacts/res/show.ico (renamed from plugins/FloatingContacts/show.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/FloatingContacts/res/version.rc (renamed from plugins/FloatingContacts/version.rc) | 2 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/bitmap_funcs.cpp (renamed from plugins/FloatingContacts/bitmap_funcs.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/bitmap_funcs.h (renamed from plugins/FloatingContacts/bitmap_funcs.h) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/filedrop.cpp (renamed from plugins/FloatingContacts/filedrop.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/filedrop.h (renamed from plugins/FloatingContacts/filedrop.h) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/fltcont.h (renamed from plugins/FloatingContacts/fltcont.h) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/main.cpp (renamed from plugins/FloatingContacts/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/options.cpp (renamed from plugins/FloatingContacts/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/resource.h (renamed from plugins/FloatingContacts/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/stdhdr.h (renamed from plugins/FloatingContacts/stdhdr.h) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/thumbs.cpp (renamed from plugins/FloatingContacts/thumbs.cpp) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/thumbs.h (renamed from plugins/FloatingContacts/thumbs.h) | 0 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/version.h (renamed from plugins/FloatingContacts/version.h) | 0 |
38 files changed, 57 insertions, 76 deletions
diff --git a/1.bat b/1.bat deleted file mode 100644 index 46af6c93de..0000000000 --- a/1.bat +++ /dev/null @@ -1 +0,0 @@ -del /F /S /Q /A RHS *.sdf *.suo *.user
\ No newline at end of file diff --git a/plugins/FirstRun/FirstRun.vcxproj b/plugins/FirstRun/FirstRun.vcxproj index 99d7f94327..e262c4a4f0 100644 --- a/plugins/FirstRun/FirstRun.vcxproj +++ b/plugins/FirstRun/FirstRun.vcxproj @@ -135,7 +135,6 @@ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
@@ -147,10 +146,10 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="main.cpp" />
+ <ClCompile Include="src\main.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h" />
+ <ClInclude Include="src\commonheaders.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FirstRun/FirstRun.vcxproj.filters b/plugins/FirstRun/FirstRun.vcxproj.filters index 782e0f59ee..84d31bcfc1 100644 --- a/plugins/FirstRun/FirstRun.vcxproj.filters +++ b/plugins/FirstRun/FirstRun.vcxproj.filters @@ -9,18 +9,14 @@ <UniqueIdentifier>{196047f9-ebe5-4820-92f6-8142fff77f44}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{9633b99b-6e98-48bf-a30e-fb695b840910}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
diff --git a/plugins/FirstRun/firstrun-translation.txt b/plugins/FirstRun/docs/firstrun-translation.txt index 52329c17db..52329c17db 100644 --- a/plugins/FirstRun/firstrun-translation.txt +++ b/plugins/FirstRun/docs/firstrun-translation.txt diff --git a/plugins/FirstRun/commonheaders.h b/plugins/FirstRun/src/commonheaders.h index 1839f53fc1..1839f53fc1 100644 --- a/plugins/FirstRun/commonheaders.h +++ b/plugins/FirstRun/src/commonheaders.h diff --git a/plugins/FirstRun/main.cpp b/plugins/FirstRun/src/main.cpp index cbe3b18f9d..cbe3b18f9d 100644 --- a/plugins/FirstRun/main.cpp +++ b/plugins/FirstRun/src/main.cpp 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 Binary files differindex 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
diff --git a/plugins/FloatingContacts/FltCont_10.vcxproj b/plugins/FloatingContacts/FltCont_10.vcxproj index 4a458c3bbc..499ee9f34e 100644 --- a/plugins/FloatingContacts/FltCont_10.vcxproj +++ b/plugins/FloatingContacts/FltCont_10.vcxproj @@ -176,30 +176,26 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="bitmap_funcs.cpp" />
- <ClCompile Include="filedrop.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\bitmap_funcs.cpp" />
+ <ClCompile Include="src\filedrop.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="options.cpp" />
- <ClCompile Include="thumbs.cpp" />
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\thumbs.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="bitmap_funcs.h" />
- <ClInclude Include="filedrop.h" />
- <ClInclude Include="fltcont.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="stdhdr.h" />
- <ClInclude Include="thumbs.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\bitmap_funcs.h" />
+ <ClInclude Include="src\filedrop.h" />
+ <ClInclude Include="src\fltcont.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\stdhdr.h" />
+ <ClInclude Include="src\thumbs.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="fltcnt.rc" />
- <ResourceCompile Include="version.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="hide.ico" />
- <None Include="show.ico" />
+ <ResourceCompile Include="res\fltcnt.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FloatingContacts/FltCont_10.vcxproj.filters b/plugins/FloatingContacts/FltCont_10.vcxproj.filters index b4bf7a5052..9e23c2e2e6 100644 --- a/plugins/FloatingContacts/FltCont_10.vcxproj.filters +++ b/plugins/FloatingContacts/FltCont_10.vcxproj.filters @@ -15,59 +15,51 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="bitmap_funcs.cpp">
+ <ClCompile Include="src\bitmap_funcs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filedrop.cpp">
+ <ClCompile Include="src\filedrop.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <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>
- <ClCompile Include="thumbs.cpp">
+ <ClCompile Include="src\thumbs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="bitmap_funcs.h">
+ <ClInclude Include="src\bitmap_funcs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="filedrop.h">
+ <ClInclude Include="src\filedrop.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="fltcont.h">
+ <ClInclude Include="src\fltcont.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="stdhdr.h">
+ <ClInclude Include="src\stdhdr.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="thumbs.h">
+ <ClInclude Include="src\thumbs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="fltcnt.rc">
+ <ResourceCompile Include="res\fltcnt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="hide.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="show.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/FloatingContacts/floatingcontacts-translation.txt b/plugins/FloatingContacts/docs/floatingcontacts-translation.txt index 5283e4a460..5283e4a460 100644 --- a/plugins/FloatingContacts/floatingcontacts-translation.txt +++ b/plugins/FloatingContacts/docs/floatingcontacts-translation.txt diff --git a/plugins/FloatingContacts/fltcnt.rc b/plugins/FloatingContacts/res/fltcnt.rc index c341a349cc..389e3ebd4d 100644 --- a/plugins/FloatingContacts/fltcnt.rc +++ b/plugins/FloatingContacts/res/fltcnt.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/FloatingContacts/hide.ico b/plugins/FloatingContacts/res/hide.ico Binary files differindex 941da6aeb9..941da6aeb9 100644 --- a/plugins/FloatingContacts/hide.ico +++ b/plugins/FloatingContacts/res/hide.ico diff --git a/plugins/FloatingContacts/show.ico b/plugins/FloatingContacts/res/show.ico Binary files differindex f924c12891..f924c12891 100644 --- a/plugins/FloatingContacts/show.ico +++ b/plugins/FloatingContacts/res/show.ico diff --git a/plugins/FloatingContacts/version.rc b/plugins/FloatingContacts/res/version.rc index dcf1828ca6..007e8fd533 100644 --- a/plugins/FloatingContacts/version.rc +++ b/plugins/FloatingContacts/res/version.rc @@ -3,7 +3,7 @@ #endif //APSTUDIO_INVOKED
#include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION FILE_VERSION
diff --git a/plugins/FloatingContacts/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index 334bf98abe..334bf98abe 100644 --- a/plugins/FloatingContacts/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp diff --git a/plugins/FloatingContacts/bitmap_funcs.h b/plugins/FloatingContacts/src/bitmap_funcs.h index 85bbee2004..85bbee2004 100644 --- a/plugins/FloatingContacts/bitmap_funcs.h +++ b/plugins/FloatingContacts/src/bitmap_funcs.h diff --git a/plugins/FloatingContacts/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp index 473c7a6814..473c7a6814 100644 --- a/plugins/FloatingContacts/filedrop.cpp +++ b/plugins/FloatingContacts/src/filedrop.cpp diff --git a/plugins/FloatingContacts/filedrop.h b/plugins/FloatingContacts/src/filedrop.h index b5c7f803aa..b5c7f803aa 100644 --- a/plugins/FloatingContacts/filedrop.h +++ b/plugins/FloatingContacts/src/filedrop.h diff --git a/plugins/FloatingContacts/fltcont.h b/plugins/FloatingContacts/src/fltcont.h index 3d725d71bc..3d725d71bc 100644 --- a/plugins/FloatingContacts/fltcont.h +++ b/plugins/FloatingContacts/src/fltcont.h diff --git a/plugins/FloatingContacts/main.cpp b/plugins/FloatingContacts/src/main.cpp index f51e1f6d34..f51e1f6d34 100644 --- a/plugins/FloatingContacts/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp diff --git a/plugins/FloatingContacts/options.cpp b/plugins/FloatingContacts/src/options.cpp index cee946a438..cee946a438 100644 --- a/plugins/FloatingContacts/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp diff --git a/plugins/FloatingContacts/resource.h b/plugins/FloatingContacts/src/resource.h index fec93538d8..fec93538d8 100644 --- a/plugins/FloatingContacts/resource.h +++ b/plugins/FloatingContacts/src/resource.h diff --git a/plugins/FloatingContacts/stdhdr.h b/plugins/FloatingContacts/src/stdhdr.h index 03b671515f..03b671515f 100644 --- a/plugins/FloatingContacts/stdhdr.h +++ b/plugins/FloatingContacts/src/stdhdr.h diff --git a/plugins/FloatingContacts/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index 0195ff0717..0195ff0717 100644 --- a/plugins/FloatingContacts/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp diff --git a/plugins/FloatingContacts/thumbs.h b/plugins/FloatingContacts/src/thumbs.h index ee6db80097..ee6db80097 100644 --- a/plugins/FloatingContacts/thumbs.h +++ b/plugins/FloatingContacts/src/thumbs.h diff --git a/plugins/FloatingContacts/version.h b/plugins/FloatingContacts/src/version.h index 3b8d0e8e20..3b8d0e8e20 100644 --- a/plugins/FloatingContacts/version.h +++ b/plugins/FloatingContacts/src/version.h |