diff options
| -rw-r--r-- | plugins/Rate/docs/rate-translation.txt (renamed from plugins/Rate/rate-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Rate/rate_10.vcxproj | 25 | ||||
| -rw-r--r-- | plugins/Rate/rate_10.vcxproj.filters | 30 | ||||
| -rw-r--r-- | plugins/Rate/res/rate.rc (renamed from plugins/Rate/rate.rc) | 10 | ||||
| -rw-r--r-- | plugins/Rate/res/rate_high.ico (renamed from plugins/Rate/icons/rate_high.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | plugins/Rate/res/rate_low.ico (renamed from plugins/Rate/icons/rate_low.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | plugins/Rate/res/rate_med.ico (renamed from plugins/Rate/icons/rate_med.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | plugins/Rate/src/commonheaders.h (renamed from plugins/Rate/commonheaders.h) | 0 | ||||
| -rw-r--r-- | plugins/Rate/src/main.cpp (renamed from plugins/Rate/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Rate/src/options.cpp (renamed from plugins/Rate/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Rate/src/resource.h (renamed from plugins/Rate/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/RecentContacts/Docs/recentcontacts-translation.txt (renamed from plugins/RecentContacts/recentcontacts-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/RecentContacts/RecentContacts.bmp | bin | 630 -> 0 bytes | |||
| -rw-r--r-- | plugins/RecentContacts/RecentContacts.vcxproj | 22 | ||||
| -rw-r--r-- | plugins/RecentContacts/RecentContacts.vcxproj.filters | 18 | ||||
| -rw-r--r-- | plugins/RecentContacts/res/RecentContacts.ico (renamed from plugins/RecentContacts/RecentContacts.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/RecentContacts/res/resource.rc (renamed from plugins/RecentContacts/resource.rc) | 4 | ||||
| -rw-r--r-- | plugins/RecentContacts/src/RecentContacts.cpp (renamed from plugins/RecentContacts/RecentContacts.cpp) | 0 | ||||
| -rw-r--r-- | plugins/RecentContacts/src/RecentContacts.h (renamed from plugins/RecentContacts/RecentContacts.h) | 0 | ||||
| -rw-r--r-- | plugins/RecentContacts/src/options.cpp (renamed from plugins/RecentContacts/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/RecentContacts/src/resource.h (renamed from plugins/RecentContacts/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/Docs/scriver-translation.txt (renamed from plugins/Scriver/scriver-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/icons.rc | 33 | ||||
| -rw-r--r-- | plugins/Scriver/res/resource.rc (renamed from plugins/Scriver/resource.rc) | 128 | ||||
| -rw-r--r-- | plugins/Scriver/scriver_10.vcxproj | 100 | ||||
| -rw-r--r-- | plugins/Scriver/scriver_10.vcxproj.filters | 100 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/chat.h (renamed from plugins/Scriver/chat/chat.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/clist.cpp (renamed from plugins/Scriver/chat/clist.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/colorchooser.cpp (renamed from plugins/Scriver/chat/colorchooser.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/log.cpp (renamed from plugins/Scriver/chat/log.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/main.cpp (renamed from plugins/Scriver/chat/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/manager.cpp (renamed from plugins/Scriver/chat/manager.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/message.cpp (renamed from plugins/Scriver/chat/message.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/options.cpp (renamed from plugins/Scriver/chat/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/services.cpp (renamed from plugins/Scriver/chat/services.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/tools.cpp (renamed from plugins/Scriver/chat/tools.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/window.cpp (renamed from plugins/Scriver/chat/window.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/cmdlist.cpp (renamed from plugins/Scriver/cmdlist.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/cmdlist.h (renamed from plugins/Scriver/cmdlist.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/commonheaders.h (renamed from plugins/Scriver/commonheaders.h) | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/globals.cpp (renamed from plugins/Scriver/globals.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/globals.h (renamed from plugins/Scriver/globals.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/infobar.cpp (renamed from plugins/Scriver/infobar.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/infobar.h (renamed from plugins/Scriver/infobar.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/input.cpp (renamed from plugins/Scriver/input.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/input.h (renamed from plugins/Scriver/input.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp (renamed from plugins/Scriver/msgdialog.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msglog.cpp (renamed from plugins/Scriver/msglog.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgoptions.cpp (renamed from plugins/Scriver/msgoptions.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgs.cpp (renamed from plugins/Scriver/msgs.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgs.h (renamed from plugins/Scriver/msgs.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgtimedout.cpp (renamed from plugins/Scriver/msgtimedout.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgwindow.cpp (renamed from plugins/Scriver/msgwindow.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgwindow.h (renamed from plugins/Scriver/msgwindow.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/multimon.h (renamed from plugins/Scriver/multimon.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/resource.h (renamed from plugins/Scriver/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/richutil.cpp (renamed from plugins/Scriver/richutil.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/richutil.h (renamed from plugins/Scriver/richutil.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/sendqueue.cpp (renamed from plugins/Scriver/sendqueue.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/sendqueue.h (renamed from plugins/Scriver/sendqueue.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/srmm.cpp (renamed from plugins/Scriver/srmm.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/statusicon.cpp (renamed from plugins/Scriver/statusicon.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/statusicon.h (renamed from plugins/Scriver/statusicon.h) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/utils.cpp (renamed from plugins/Scriver/utils.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Scriver/src/utils.h (renamed from plugins/Scriver/utils.h) | 0 |
65 files changed, 180 insertions, 292 deletions
diff --git a/plugins/Rate/rate-translation.txt b/plugins/Rate/docs/rate-translation.txt index a6b3b909de..a6b3b909de 100644 --- a/plugins/Rate/rate-translation.txt +++ b/plugins/Rate/docs/rate-translation.txt diff --git a/plugins/Rate/rate_10.vcxproj b/plugins/Rate/rate_10.vcxproj index 1675f7e947..82e835bbb9 100644 --- a/plugins/Rate/rate_10.vcxproj +++ b/plugins/Rate/rate_10.vcxproj @@ -73,7 +73,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AUTHSTATE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -97,7 +97,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;AUTHSTATE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -119,7 +119,7 @@ <ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AUTHSTATE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
@@ -142,7 +142,7 @@ <ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;AUTHSTATE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
@@ -162,22 +162,15 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="main.cpp" />
- <ClCompile Include="options.cpp" />
+ <ClCompile Include="src\main.cpp" />
+ <ClCompile Include="src\options.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="rate.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="icons\rate_high.ico" />
- <None Include="icons\rate_low.ico" />
- <None Include="icons\rate_med.ico" />
- <None Include="docs\Rate-readme.txt" />
- <None Include="docs\rate.txt" />
+ <ResourceCompile Include="res\rate.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Rate/rate_10.vcxproj.filters b/plugins/Rate/rate_10.vcxproj.filters index 53188635f5..ba69553d11 100644 --- a/plugins/Rate/rate_10.vcxproj.filters +++ b/plugins/Rate/rate_10.vcxproj.filters @@ -13,46 +13,26 @@ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
- <Filter Include="Docs">
- <UniqueIdentifier>{629d9113-01ed-4da4-8f68-76e949ebdb7b}</UniqueIdentifier>
- </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>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="rate.rc">
+ <ResourceCompile Include="res\rate.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="icons\rate_high.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\rate_low.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\rate_med.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="docs\Rate-readme.txt">
- <Filter>Docs</Filter>
- </None>
- <None Include="docs\rate.txt">
- <Filter>Docs</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Rate/rate.rc b/plugins/Rate/res/rate.rc index e1a75b6808..59a1db4d1f 100644 --- a/plugins/Rate/rate.rc +++ b/plugins/Rate/res/rate.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_RATEHI ICON "icons\\rate_high.ico"
-IDI_RATELO ICON "icons\\rate_low.ico"
-IDI_RATEME ICON "icons\\rate_med.ico"
+IDI_RATEHI ICON "rate_high.ico"
+IDI_RATELO ICON "rate_low.ico"
+IDI_RATEME ICON "rate_med.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/Rate/icons/rate_high.ico b/plugins/Rate/res/rate_high.ico Binary files differindex ad5fa6acf1..ad5fa6acf1 100644 --- a/plugins/Rate/icons/rate_high.ico +++ b/plugins/Rate/res/rate_high.ico diff --git a/plugins/Rate/icons/rate_low.ico b/plugins/Rate/res/rate_low.ico Binary files differindex 66a340da9c..66a340da9c 100644 --- a/plugins/Rate/icons/rate_low.ico +++ b/plugins/Rate/res/rate_low.ico diff --git a/plugins/Rate/icons/rate_med.ico b/plugins/Rate/res/rate_med.ico Binary files differindex 2b3220de1b..2b3220de1b 100644 --- a/plugins/Rate/icons/rate_med.ico +++ b/plugins/Rate/res/rate_med.ico diff --git a/plugins/Rate/commonheaders.h b/plugins/Rate/src/commonheaders.h index 9fde7034e0..9fde7034e0 100644 --- a/plugins/Rate/commonheaders.h +++ b/plugins/Rate/src/commonheaders.h diff --git a/plugins/Rate/main.cpp b/plugins/Rate/src/main.cpp index 772d23f790..772d23f790 100644 --- a/plugins/Rate/main.cpp +++ b/plugins/Rate/src/main.cpp diff --git a/plugins/Rate/options.cpp b/plugins/Rate/src/options.cpp index d6088aa691..d6088aa691 100644 --- a/plugins/Rate/options.cpp +++ b/plugins/Rate/src/options.cpp diff --git a/plugins/Rate/resource.h b/plugins/Rate/src/resource.h index 3b27728839..3b27728839 100644 --- a/plugins/Rate/resource.h +++ b/plugins/Rate/src/resource.h diff --git a/plugins/RecentContacts/recentcontacts-translation.txt b/plugins/RecentContacts/Docs/recentcontacts-translation.txt index 9140db11ec..9140db11ec 100644 --- a/plugins/RecentContacts/recentcontacts-translation.txt +++ b/plugins/RecentContacts/Docs/recentcontacts-translation.txt diff --git a/plugins/RecentContacts/RecentContacts.bmp b/plugins/RecentContacts/RecentContacts.bmp Binary files differdeleted file mode 100644 index 070d7a5124..0000000000 --- a/plugins/RecentContacts/RecentContacts.bmp +++ /dev/null diff --git a/plugins/RecentContacts/RecentContacts.vcxproj b/plugins/RecentContacts/RecentContacts.vcxproj index f78fb0ef7f..310a506c57 100644 --- a/plugins/RecentContacts/RecentContacts.vcxproj +++ b/plugins/RecentContacts/RecentContacts.vcxproj @@ -75,7 +75,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;V_RECENTCONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -102,7 +102,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;V_RECENTCONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -127,7 +127,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;V_RECENTCONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -152,7 +152,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;V_RECENTCONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -172,21 +172,17 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="options.cpp" />
- <ClCompile Include="RecentContacts.cpp">
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\RecentContacts.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="resource.h" />
- <ClInclude Include="RecentContacts.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\RecentContacts.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="RecentContacts.bmp" />
- <None Include="RecentContacts.ico" />
+ <ResourceCompile Include="res\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/RecentContacts/RecentContacts.vcxproj.filters b/plugins/RecentContacts/RecentContacts.vcxproj.filters index 9af855e77a..bb7496f749 100644 --- a/plugins/RecentContacts/RecentContacts.vcxproj.filters +++ b/plugins/RecentContacts/RecentContacts.vcxproj.filters @@ -15,32 +15,24 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="RecentContacts.cpp">
+ <ClCompile Include="src\RecentContacts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="RecentContacts.h">
+ <ClInclude Include="src\RecentContacts.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="RecentContacts.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="RecentContacts.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/RecentContacts/RecentContacts.ico b/plugins/RecentContacts/res/RecentContacts.ico Binary files differindex 25efdf36ab..25efdf36ab 100644 --- a/plugins/RecentContacts/RecentContacts.ico +++ b/plugins/RecentContacts/res/RecentContacts.ico diff --git a/plugins/RecentContacts/resource.rc b/plugins/RecentContacts/res/resource.rc index 463d9f0a76..1425b886b8 100644 --- a/plugins/RecentContacts/resource.rc +++ b/plugins/RecentContacts/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -60,7 +60,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/RecentContacts/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index fcc3dda6ac..fcc3dda6ac 100644 --- a/plugins/RecentContacts/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp diff --git a/plugins/RecentContacts/RecentContacts.h b/plugins/RecentContacts/src/RecentContacts.h index 6b5731fa7d..6b5731fa7d 100644 --- a/plugins/RecentContacts/RecentContacts.h +++ b/plugins/RecentContacts/src/RecentContacts.h diff --git a/plugins/RecentContacts/options.cpp b/plugins/RecentContacts/src/options.cpp index d8f09adb9b..d8f09adb9b 100644 --- a/plugins/RecentContacts/options.cpp +++ b/plugins/RecentContacts/src/options.cpp diff --git a/plugins/RecentContacts/resource.h b/plugins/RecentContacts/src/resource.h index 59e47a934a..59e47a934a 100644 --- a/plugins/RecentContacts/resource.h +++ b/plugins/RecentContacts/src/resource.h diff --git a/plugins/Scriver/scriver-translation.txt b/plugins/Scriver/Docs/scriver-translation.txt index bfb171472f..bfb171472f 100644 --- a/plugins/Scriver/scriver-translation.txt +++ b/plugins/Scriver/Docs/scriver-translation.txt diff --git a/plugins/Scriver/icons.rc b/plugins/Scriver/icons.rc deleted file mode 100644 index 921a239b5f..0000000000 --- a/plugins/Scriver/icons.rc +++ /dev/null @@ -1,33 +0,0 @@ -#include "resource.h"
-#ifdef __MINGW32__
- #define WINVER 0x500
- #define _WIN32_WINNT 0x501
- #define _WIN32_IE 0x500
-#endif
-#include <windows.h>
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1)
-#endif
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ADDCONTACT ICON DISCARDABLE "res/addcontact.ico"
-IDI_USERDETAILS ICON DISCARDABLE "res/details.ico"
-IDI_HISTORY ICON DISCARDABLE "res/history.ico"
-IDI_SEND ICON DISCARDABLE "res/send.ico"
-IDI_CANCEL ICON DISCARDABLE "res/delete.ico"
-IDI_SMILEY ICON DISCARDABLE "res/smiley.ico"
-IDI_TYPING ICON DISCARDABLE "res/typing.ico"
-IDI_UNICODEON ICON DISCARDABLE "res/unicodeon.ico"
-IDI_UNICODEOFF ICON DISCARDABLE "res/unicodeoff.ico"
-IDI_TIMESTAMP ICON DISCARDABLE "res/clock.ico"
-IDI_QUOTE ICON DISCARDABLE "res/quote.ico"
-IDI_INCOMING ICON DISCARDABLE "res/incoming.ico"
-IDI_OUTGOING ICON DISCARDABLE "res/outgoing.ico"
-IDI_NOTICE ICON DISCARDABLE "res/notice.ico"
-
-
diff --git a/plugins/Scriver/resource.rc b/plugins/Scriver/res/resource.rc index ae3a8fbe06..543d99749b 100644 --- a/plugins/Scriver/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -1,9 +1,4 @@ -#include "resource.h"
-#ifdef __MINGW32__
- #define WINVER 0x500
- #define _WIN32_WINNT 0x501
- #define _WIN32_IE 0x500
-#endif
+#include "..\src\resource.h"
#include <windows.h>
#undef RICHEDIT_CLASS
@@ -498,20 +493,18 @@ END // TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
BEGIN
"#include <windows.h>\r\n"
- "#include <winres.h>\r\n"
- "#include ""../../include/statusmodes.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -527,59 +520,59 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ADDCONTACT ICON DISCARDABLE "res/addcontact.ico"
-IDI_USERDETAILS ICON DISCARDABLE "res/details.ico"
-IDI_HISTORY ICON DISCARDABLE "res/history.ico"
-IDI_SEND ICON DISCARDABLE "res/send.ico"
-IDI_SMILEY ICON DISCARDABLE "res/smiley.ico"
-IDI_TYPING ICON DISCARDABLE "res/typing.ico"
-IDI_TYPINGOFF ICON DISCARDABLE "res/typingoff.ico"
-IDI_UNICODEON ICON DISCARDABLE "res/unicode.ico"
-IDI_UNICODEOFF ICON DISCARDABLE "res/ansi.ico"
-IDI_TIMESTAMP ICON DISCARDABLE "res/clock.ico"
-IDI_QUOTE ICON DISCARDABLE "res/quote.ico"
-IDI_INCOMING ICON DISCARDABLE "res/message.ico"
-IDI_OUTGOING ICON DISCARDABLE "res/messageout.ico"
-IDI_NOTICE ICON DISCARDABLE "res/highlight.ico"
-IDI_CLOSEX ICON DISCARDABLE "res/closex.ico"
+IDI_ADDCONTACT ICON "addcontact.ico"
+IDI_USERDETAILS ICON "details.ico"
+IDI_HISTORY ICON "history.ico"
+IDI_SEND ICON "send.ico"
+IDI_SMILEY ICON "smiley.ico"
+IDI_TYPING ICON "typing.ico"
+IDI_TYPINGOFF ICON "typingoff.ico"
+IDI_UNICODEON ICON "unicode.ico"
+IDI_UNICODEOFF ICON "ansi.ico"
+IDI_TIMESTAMP ICON "clock.ico"
+IDI_QUOTE ICON "quote.ico"
+IDI_INCOMING ICON "message.ico"
+IDI_OUTGOING ICON "messageout.ico"
+IDI_NOTICE ICON "highlight.ico"
+IDI_CLOSEX ICON "closex.ico"
// chat icons
-IDI_BUNDERLINE ICON "res/chat/underline.ico"
-IDI_BBOLD ICON "res/chat/bold.ico"
-IDI_BITALICS ICON "res/chat/italic.ico"
-IDI_JOIN ICON "res/chat/join.ico"
-IDI_TOPIC ICON "res/chat/topic.ico"
-IDI_ADDSTATUS ICON "res/chat/addmode.ico"
-IDI_INFO ICON "res/chat/info.ico"
-IDI_KICK ICON "res/chat/kick.ico"
-IDI_NICK ICON "res/chat/nick.ico"
-IDI_CHAT_NOTICE ICON "res/chat/notice.ico"
-IDI_PART ICON "res/chat/part.ico"
-IDI_QUIT ICON "res/chat/quit.ico"
-IDI_REMSTATUS ICON "res/chat/removestatus.ico"
-IDI_ACTION ICON "res/chat/action.ico"
-IDI_TOPICBUT ICON "res/chat/topicbut.ico"
-IDI_BKGCOLOR ICON "res/chat/bkgcolor.ico"
-IDI_CHANMGR ICON "res/chat/window.ico"
-IDI_COLOR ICON "res/chat/color.ico"
-IDI_FILTER ICON "res/chat/filter.ico"
-IDI_NICKLIST ICON "res/chat/nicklist.ico"
-IDI_STATUS3 ICON "res/chat/4.ico"
-IDI_STATUS2 ICON "res/chat/3.ico"
-IDI_STATUS4 ICON "res/chat/5.ico"
-IDI_STATUS1 ICON "res/chat/2.ico"
-IDI_STATUS0 ICON "res/chat/1.ico"
-IDI_STATUS5 ICON "res/chat/6.ico"
-IDI_OVERLAY ICON "res/chat/overlay.ico"
-IDI_NICKLIST2 ICON "res/chat/nicklist2.ico"
-IDI_FILTER2 ICON "res/chat/filter2.ico"
-
-IDI_GOOGLE ICON "res/google.ico"
-IDI_BING ICON "res/bing.ico"
-IDI_WIKIPEDIA ICON "res/wikipedia.ico"
-IDI_GOOGLE_MAPS ICON "res/gmaps.ico"
-IDI_GOOGLE_TRANSLATE ICON "res/gtranslate.ico"
-IDI_YAHOO ICON "res/yahoo.ico"
-IDI_FOODNETWORK ICON "res/foodnetwork.ico"
+IDI_BUNDERLINE ICON "chat/underline.ico"
+IDI_BBOLD ICON "chat/bold.ico"
+IDI_BITALICS ICON "chat/italic.ico"
+IDI_JOIN ICON "chat/join.ico"
+IDI_TOPIC ICON "chat/topic.ico"
+IDI_ADDSTATUS ICON "chat/addmode.ico"
+IDI_INFO ICON "chat/info.ico"
+IDI_KICK ICON "chat/kick.ico"
+IDI_NICK ICON "chat/nick.ico"
+IDI_CHAT_NOTICE ICON "chat/notice.ico"
+IDI_PART ICON "chat/part.ico"
+IDI_QUIT ICON "chat/quit.ico"
+IDI_REMSTATUS ICON "chat/removestatus.ico"
+IDI_ACTION ICON "chat/action.ico"
+IDI_TOPICBUT ICON "chat/topicbut.ico"
+IDI_BKGCOLOR ICON "chat/bkgcolor.ico"
+IDI_CHANMGR ICON "chat/window.ico"
+IDI_COLOR ICON "chat/color.ico"
+IDI_FILTER ICON "chat/filter.ico"
+IDI_NICKLIST ICON "chat/nicklist.ico"
+IDI_STATUS3 ICON "chat/4.ico"
+IDI_STATUS2 ICON "chat/3.ico"
+IDI_STATUS4 ICON "chat/5.ico"
+IDI_STATUS1 ICON "chat/2.ico"
+IDI_STATUS0 ICON "chat/1.ico"
+IDI_STATUS5 ICON "chat/6.ico"
+IDI_OVERLAY ICON "chat/overlay.ico"
+IDI_NICKLIST2 ICON "chat/nicklist2.ico"
+IDI_FILTER2 ICON "chat/filter2.ico"
+
+IDI_GOOGLE ICON "google.ico"
+IDI_BING ICON "bing.ico"
+IDI_WIKIPEDIA ICON "wikipedia.ico"
+IDI_GOOGLE_MAPS ICON "gmaps.ico"
+IDI_GOOGLE_TRANSLATE ICON "gtranslate.ico"
+IDI_YAHOO ICON "yahoo.ico"
+IDI_FOODNETWORK ICON "foodnetwork.ico"
/////////////////////////////////////////////////////////////////////////////
@@ -587,8 +580,8 @@ IDI_FOODNETWORK ICON "res/foodnetwork.ico" // Cursor
//
-IDC_HYPERLINKHAND CURSOR DISCARDABLE "res/hyperlin.cur"
-IDC_DRAGCURSOR CURSOR DISCARDABLE "res/dragcopy.cur"
+IDC_HYPERLINKHAND CURSOR "hyperlin.cur"
+IDC_DRAGCURSOR CURSOR "dragcopy.cur"
/////////////////////////////////////////////////////////////////////////////
//
@@ -674,7 +667,6 @@ BEGIN END
END
-#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
@@ -714,8 +706,6 @@ BEGIN END
END
-#endif // !_MAC
-
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Scriver/scriver_10.vcxproj b/plugins/Scriver/scriver_10.vcxproj index dd422ffd3e..efa1a773d4 100644 --- a/plugins/Scriver/scriver_10.vcxproj +++ b/plugins/Scriver/scriver_10.vcxproj @@ -75,7 +75,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -83,7 +83,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -107,7 +106,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -115,7 +114,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -137,7 +135,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -146,7 +144,6 @@ <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -166,7 +163,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -174,7 +171,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,80 +187,72 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="cmdlist.cpp" />
- <ClCompile Include="globals.cpp" />
- <ClCompile Include="infobar.cpp" />
- <ClCompile Include="input.cpp" />
- <ClCompile Include="msgdialog.cpp" />
- <ClCompile Include="msglog.cpp" />
- <ClCompile Include="msgoptions.cpp" />
- <ClCompile Include="msgs.cpp" />
- <ClCompile Include="msgtimedout.cpp" />
- <ClCompile Include="msgwindow.cpp" />
- <ClCompile Include="richutil.cpp" />
- <ClCompile Include="sendqueue.cpp" />
- <ClCompile Include="srmm.cpp">
+ <ClCompile Include="src\cmdlist.cpp" />
+ <ClCompile Include="src\globals.cpp" />
+ <ClCompile Include="src\infobar.cpp" />
+ <ClCompile Include="src\input.cpp" />
+ <ClCompile Include="src\msgdialog.cpp" />
+ <ClCompile Include="src\msglog.cpp" />
+ <ClCompile Include="src\msgoptions.cpp" />
+ <ClCompile Include="src\msgs.cpp" />
+ <ClCompile Include="src\msgtimedout.cpp" />
+ <ClCompile Include="src\msgwindow.cpp" />
+ <ClCompile Include="src\richutil.cpp" />
+ <ClCompile Include="src\sendqueue.cpp" />
+ <ClCompile Include="src\srmm.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="statusicon.cpp" />
- <ClCompile Include="utils.cpp" />
- <ClCompile Include="chat\clist.cpp">
+ <ClCompile Include="src\statusicon.cpp" />
+ <ClCompile Include="src\utils.cpp" />
+ <ClCompile Include="src\chat\clist.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\colorchooser.cpp">
+ <ClCompile Include="src\chat\colorchooser.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\log.cpp">
+ <ClCompile Include="src\chat\log.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\main.cpp">
+ <ClCompile Include="src\chat\main.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\manager.cpp">
+ <ClCompile Include="src\chat\manager.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\message.cpp">
+ <ClCompile Include="src\chat\message.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\options.cpp">
+ <ClCompile Include="src\chat\options.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\services.cpp">
+ <ClCompile Include="src\chat\services.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\tools.cpp">
+ <ClCompile Include="src\chat\tools.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="chat\window.cpp">
+ <ClCompile Include="src\chat\window.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="cmdlist.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="globals.h" />
- <ClInclude Include="infobar.h" />
- <ClInclude Include="input.h" />
- <ClInclude Include="msgs.h" />
- <ClInclude Include="msgwindow.h" />
- <ClInclude Include="multimon.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="richutil.h" />
- <ClInclude Include="sendqueue.h" />
- <ClInclude Include="statusicon.h" />
- <ClInclude Include="utils.h" />
- <ClInclude Include="chat\chat.h" />
+ <ClInclude Include="src\cmdlist.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\globals.h" />
+ <ClInclude Include="src\infobar.h" />
+ <ClInclude Include="src\input.h" />
+ <ClInclude Include="src\msgs.h" />
+ <ClInclude Include="src\msgwindow.h" />
+ <ClInclude Include="src\multimon.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\richutil.h" />
+ <ClInclude Include="src\sendqueue.h" />
+ <ClInclude Include="src\statusicon.h" />
+ <ClInclude Include="src\utils.h" />
+ <ClInclude Include="src\chat\chat.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\addcontact.ico" />
- <None Include="res\delete.ico" />
- <None Include="res\dragcopy.cur" />
- <None Include="res\hyperlin.cur" />
- <None Include="res\quote.ico" />
- <None Include="res\typingoff.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="res\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Scriver/scriver_10.vcxproj.filters b/plugins/Scriver/scriver_10.vcxproj.filters index a2c076fb13..8421968630 100644 --- a/plugins/Scriver/scriver_10.vcxproj.filters +++ b/plugins/Scriver/scriver_10.vcxproj.filters @@ -21,148 +21,128 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="cmdlist.cpp">
+ <ClCompile Include="src\cmdlist.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="globals.cpp">
+ <ClCompile Include="src\globals.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="infobar.cpp">
+ <ClCompile Include="src\infobar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="input.cpp">
+ <ClCompile Include="src\input.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgdialog.cpp">
+ <ClCompile Include="src\msgdialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msglog.cpp">
+ <ClCompile Include="src\msglog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgoptions.cpp">
+ <ClCompile Include="src\msgoptions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgs.cpp">
+ <ClCompile Include="src\msgs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgtimedout.cpp">
+ <ClCompile Include="src\msgtimedout.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgwindow.cpp">
+ <ClCompile Include="src\msgwindow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="richutil.cpp">
+ <ClCompile Include="src\richutil.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="sendqueue.cpp">
+ <ClCompile Include="src\sendqueue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="srmm.cpp">
+ <ClCompile Include="src\srmm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="statusicon.cpp">
+ <ClCompile Include="src\statusicon.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.cpp">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="chat\clist.cpp">
+ <ClCompile Include="src\chat\clist.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\colorchooser.cpp">
+ <ClCompile Include="src\chat\colorchooser.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\log.cpp">
+ <ClCompile Include="src\chat\log.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\main.cpp">
+ <ClCompile Include="src\chat\main.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\manager.cpp">
+ <ClCompile Include="src\chat\manager.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\message.cpp">
+ <ClCompile Include="src\chat\message.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\options.cpp">
+ <ClCompile Include="src\chat\options.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\services.cpp">
+ <ClCompile Include="src\chat\services.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\tools.cpp">
+ <ClCompile Include="src\chat\tools.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
- <ClCompile Include="chat\window.cpp">
+ <ClCompile Include="src\chat\window.cpp">
<Filter>Source Files\chat</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="cmdlist.h">
+ <ClInclude Include="src\cmdlist.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="globals.h">
+ <ClInclude Include="src\globals.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="infobar.h">
+ <ClInclude Include="src\infobar.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="input.h">
+ <ClInclude Include="src\input.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="msgs.h">
+ <ClInclude Include="src\msgs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="msgwindow.h">
+ <ClInclude Include="src\msgwindow.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="multimon.h">
+ <ClInclude Include="src\multimon.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="richutil.h">
+ <ClInclude Include="src\richutil.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="sendqueue.h">
+ <ClInclude Include="src\sendqueue.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="statusicon.h">
+ <ClInclude Include="src\statusicon.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="utils.h">
+ <ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="chat\chat.h">
+ <ClInclude Include="src\chat\chat.h">
<Filter>Header Files\chat</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="res\addcontact.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\delete.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\dragcopy.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\hyperlin.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\quote.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\typingoff.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Scriver/chat/chat.h b/plugins/Scriver/src/chat/chat.h index b8671fdb82..b8671fdb82 100644 --- a/plugins/Scriver/chat/chat.h +++ b/plugins/Scriver/src/chat/chat.h diff --git a/plugins/Scriver/chat/clist.cpp b/plugins/Scriver/src/chat/clist.cpp index 2c32bc7169..2c32bc7169 100644 --- a/plugins/Scriver/chat/clist.cpp +++ b/plugins/Scriver/src/chat/clist.cpp diff --git a/plugins/Scriver/chat/colorchooser.cpp b/plugins/Scriver/src/chat/colorchooser.cpp index 67dc78a90d..67dc78a90d 100644 --- a/plugins/Scriver/chat/colorchooser.cpp +++ b/plugins/Scriver/src/chat/colorchooser.cpp diff --git a/plugins/Scriver/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp index a7fc260fd1..a7fc260fd1 100644 --- a/plugins/Scriver/chat/log.cpp +++ b/plugins/Scriver/src/chat/log.cpp diff --git a/plugins/Scriver/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp index 4ff0eef47d..4ff0eef47d 100644 --- a/plugins/Scriver/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp diff --git a/plugins/Scriver/chat/manager.cpp b/plugins/Scriver/src/chat/manager.cpp index 9573c920fa..9573c920fa 100644 --- a/plugins/Scriver/chat/manager.cpp +++ b/plugins/Scriver/src/chat/manager.cpp diff --git a/plugins/Scriver/chat/message.cpp b/plugins/Scriver/src/chat/message.cpp index 7739e1acef..7739e1acef 100644 --- a/plugins/Scriver/chat/message.cpp +++ b/plugins/Scriver/src/chat/message.cpp diff --git a/plugins/Scriver/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 62ee3310fa..62ee3310fa 100644 --- a/plugins/Scriver/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp diff --git a/plugins/Scriver/chat/services.cpp b/plugins/Scriver/src/chat/services.cpp index edda2bf488..edda2bf488 100644 --- a/plugins/Scriver/chat/services.cpp +++ b/plugins/Scriver/src/chat/services.cpp diff --git a/plugins/Scriver/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp index b448ca9aa4..b448ca9aa4 100644 --- a/plugins/Scriver/chat/tools.cpp +++ b/plugins/Scriver/src/chat/tools.cpp diff --git a/plugins/Scriver/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index bf637ccb2b..bf637ccb2b 100644 --- a/plugins/Scriver/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp diff --git a/plugins/Scriver/cmdlist.cpp b/plugins/Scriver/src/cmdlist.cpp index 8f8d5b1524..8f8d5b1524 100644 --- a/plugins/Scriver/cmdlist.cpp +++ b/plugins/Scriver/src/cmdlist.cpp diff --git a/plugins/Scriver/cmdlist.h b/plugins/Scriver/src/cmdlist.h index f3ff8309db..f3ff8309db 100644 --- a/plugins/Scriver/cmdlist.h +++ b/plugins/Scriver/src/cmdlist.h diff --git a/plugins/Scriver/commonheaders.h b/plugins/Scriver/src/commonheaders.h index ff28919984..6271ef0aa9 100644 --- a/plugins/Scriver/commonheaders.h +++ b/plugins/Scriver/src/commonheaders.h @@ -24,6 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef SRMM_COMMONHEADERS_H
#define SRMM_COMMONHEADERS_H
+#define _CRT_SECURE_NO_WARNINGS
+
#define MIRANDA_VER 0x0A00
#define COMPILE_MULTIMON_STUBS
diff --git a/plugins/Scriver/globals.cpp b/plugins/Scriver/src/globals.cpp index 9a81ebcdbb..9a81ebcdbb 100644 --- a/plugins/Scriver/globals.cpp +++ b/plugins/Scriver/src/globals.cpp diff --git a/plugins/Scriver/globals.h b/plugins/Scriver/src/globals.h index d3ec2af2d8..d3ec2af2d8 100644 --- a/plugins/Scriver/globals.h +++ b/plugins/Scriver/src/globals.h diff --git a/plugins/Scriver/infobar.cpp b/plugins/Scriver/src/infobar.cpp index a540606996..a540606996 100644 --- a/plugins/Scriver/infobar.cpp +++ b/plugins/Scriver/src/infobar.cpp diff --git a/plugins/Scriver/infobar.h b/plugins/Scriver/src/infobar.h index 42580093f0..42580093f0 100644 --- a/plugins/Scriver/infobar.h +++ b/plugins/Scriver/src/infobar.h diff --git a/plugins/Scriver/input.cpp b/plugins/Scriver/src/input.cpp index 79dce58fdc..79dce58fdc 100644 --- a/plugins/Scriver/input.cpp +++ b/plugins/Scriver/src/input.cpp diff --git a/plugins/Scriver/input.h b/plugins/Scriver/src/input.h index 5cff9ba89d..5cff9ba89d 100644 --- a/plugins/Scriver/input.h +++ b/plugins/Scriver/src/input.h diff --git a/plugins/Scriver/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index a5bb8d92dd..a5bb8d92dd 100644 --- a/plugins/Scriver/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp diff --git a/plugins/Scriver/msglog.cpp b/plugins/Scriver/src/msglog.cpp index bb768cbb95..bb768cbb95 100644 --- a/plugins/Scriver/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp diff --git a/plugins/Scriver/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index f688efc50a..f688efc50a 100644 --- a/plugins/Scriver/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp diff --git a/plugins/Scriver/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 0971cfa0eb..0971cfa0eb 100644 --- a/plugins/Scriver/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp diff --git a/plugins/Scriver/msgs.h b/plugins/Scriver/src/msgs.h index e17c63897d..e17c63897d 100644 --- a/plugins/Scriver/msgs.h +++ b/plugins/Scriver/src/msgs.h diff --git a/plugins/Scriver/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp index 4a63acfa3a..4a63acfa3a 100644 --- a/plugins/Scriver/msgtimedout.cpp +++ b/plugins/Scriver/src/msgtimedout.cpp diff --git a/plugins/Scriver/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp index a59e0482e8..a59e0482e8 100644 --- a/plugins/Scriver/msgwindow.cpp +++ b/plugins/Scriver/src/msgwindow.cpp diff --git a/plugins/Scriver/msgwindow.h b/plugins/Scriver/src/msgwindow.h index 3d560550e0..3d560550e0 100644 --- a/plugins/Scriver/msgwindow.h +++ b/plugins/Scriver/src/msgwindow.h diff --git a/plugins/Scriver/multimon.h b/plugins/Scriver/src/multimon.h index aedd943da4..aedd943da4 100644 --- a/plugins/Scriver/multimon.h +++ b/plugins/Scriver/src/multimon.h diff --git a/plugins/Scriver/resource.h b/plugins/Scriver/src/resource.h index 07ea9a6546..07ea9a6546 100644 --- a/plugins/Scriver/resource.h +++ b/plugins/Scriver/src/resource.h diff --git a/plugins/Scriver/richutil.cpp b/plugins/Scriver/src/richutil.cpp index 8c562b060c..8c562b060c 100644 --- a/plugins/Scriver/richutil.cpp +++ b/plugins/Scriver/src/richutil.cpp diff --git a/plugins/Scriver/richutil.h b/plugins/Scriver/src/richutil.h index 75ecea16a3..75ecea16a3 100644 --- a/plugins/Scriver/richutil.h +++ b/plugins/Scriver/src/richutil.h diff --git a/plugins/Scriver/sendqueue.cpp b/plugins/Scriver/src/sendqueue.cpp index 1a85d67d4f..1a85d67d4f 100644 --- a/plugins/Scriver/sendqueue.cpp +++ b/plugins/Scriver/src/sendqueue.cpp diff --git a/plugins/Scriver/sendqueue.h b/plugins/Scriver/src/sendqueue.h index e92de4293b..e92de4293b 100644 --- a/plugins/Scriver/sendqueue.h +++ b/plugins/Scriver/src/sendqueue.h diff --git a/plugins/Scriver/srmm.cpp b/plugins/Scriver/src/srmm.cpp index 8d98416ddd..8d98416ddd 100644 --- a/plugins/Scriver/srmm.cpp +++ b/plugins/Scriver/src/srmm.cpp diff --git a/plugins/Scriver/statusicon.cpp b/plugins/Scriver/src/statusicon.cpp index 6b053b8adc..6b053b8adc 100644 --- a/plugins/Scriver/statusicon.cpp +++ b/plugins/Scriver/src/statusicon.cpp diff --git a/plugins/Scriver/statusicon.h b/plugins/Scriver/src/statusicon.h index d7333129c6..d7333129c6 100644 --- a/plugins/Scriver/statusicon.h +++ b/plugins/Scriver/src/statusicon.h diff --git a/plugins/Scriver/utils.cpp b/plugins/Scriver/src/utils.cpp index 3551119adc..3551119adc 100644 --- a/plugins/Scriver/utils.cpp +++ b/plugins/Scriver/src/utils.cpp diff --git a/plugins/Scriver/utils.h b/plugins/Scriver/src/utils.h index 0d3b3ab4e1..0d3b3ab4e1 100644 --- a/plugins/Scriver/utils.h +++ b/plugins/Scriver/src/utils.h |
