diff options
-rw-r--r-- | plugins/SRMM/Docs/srmm-translation.txt (renamed from plugins/SRMM/srmm-translation.txt) | 0 | ||||
-rw-r--r-- | plugins/SRMM/res/resource.rc (renamed from plugins/SRMM/resource.rc) | 20 | ||||
-rw-r--r-- | plugins/SRMM/res/version.rc (renamed from plugins/SRMM/version.rc) | 6 | ||||
-rw-r--r-- | plugins/SRMM/src/cmdlist.cpp (renamed from plugins/SRMM/cmdlist.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/cmdlist.h (renamed from plugins/SRMM/cmdlist.h) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/commonheaders.h (renamed from plugins/SRMM/commonheaders.h) | 2 | ||||
-rw-r--r-- | plugins/SRMM/src/globals.cpp (renamed from plugins/SRMM/globals.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/globals.h (renamed from plugins/SRMM/globals.h) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/msgdialog.cpp (renamed from plugins/SRMM/msgdialog.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/msglog.cpp (renamed from plugins/SRMM/msglog.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/msgoptions.cpp (renamed from plugins/SRMM/msgoptions.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/msgs.cpp (renamed from plugins/SRMM/msgs.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/msgs.h (renamed from plugins/SRMM/msgs.h) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/msgtimedout.cpp (renamed from plugins/SRMM/msgtimedout.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/resource.h (renamed from plugins/SRMM/resource.h) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/richutil.cpp (renamed from plugins/SRMM/richutil.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/richutil.h (renamed from plugins/SRMM/richutil.h) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/srmm.cpp (renamed from plugins/SRMM/srmm.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/statusicon.cpp (renamed from plugins/SRMM/statusicon.cpp) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/statusicon.h (renamed from plugins/SRMM/statusicon.h) | 0 | ||||
-rw-r--r-- | plugins/SRMM/src/version.h (renamed from plugins/SRMM/version.h) | 0 | ||||
-rw-r--r-- | plugins/SRMM/srmm_10.vcxproj | 70 | ||||
-rw-r--r-- | plugins/SRMM/srmm_10.vcxproj.filters | 94 | ||||
-rw-r--r-- | plugins/SplashScreen/docs/splash_readme.txt (renamed from plugins/SplashScreen/doc/splash_readme.txt) | 0 | ||||
-rw-r--r-- | plugins/SplashScreen/docs/splashscreen-translation.txt (renamed from plugins/SplashScreen/splashscreen-translation.txt) | 0 | ||||
-rw-r--r-- | plugins/SplashScreen/docs/todo.txt (renamed from plugins/SplashScreen/doc/todo.txt) | 0 | ||||
-rw-r--r-- | plugins/SplashScreen/res/splash.rc (renamed from plugins/SplashScreen/src/splash.rc) | 4 | ||||
-rw-r--r-- | plugins/SplashScreen/res/version.rc (renamed from plugins/SplashScreen/src/version.rc) | 2 | ||||
-rw-r--r-- | plugins/SplashScreen/splashscreen_10.vcxproj | 17 | ||||
-rw-r--r-- | plugins/SplashScreen/splashscreen_10.vcxproj.filters | 21 |
30 files changed, 66 insertions, 170 deletions
diff --git a/plugins/SRMM/srmm-translation.txt b/plugins/SRMM/Docs/srmm-translation.txt index 95e4acd75e..95e4acd75e 100644 --- a/plugins/SRMM/srmm-translation.txt +++ b/plugins/SRMM/Docs/srmm-translation.txt diff --git a/plugins/SRMM/resource.rc b/plugins/SRMM/res/resource.rc index fbcfe77156..2191538b6f 100644 --- a/plugins/SRMM/resource.rc +++ b/plugins/SRMM/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -9,7 +9,7 @@ //
#include <winres.h>
#include <richedit.h>
-#include "../../include/statusmodes.h"
+#include "statusmodes.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -266,14 +266,14 @@ END 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\sxr\\resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include <winres.h>\r\n"
"#include <richedit.h>\r\n"
- "#include ""../../include/statusmodes.h""\r\n"
+ "#include ""statusmodes.h""\r\n"
"\0"
END
@@ -293,18 +293,18 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_INCOMING ICON "res/incoming.ico"
-IDI_OUTGOING ICON "res/outgoing.ico"
-IDI_NOTICE ICON "res/notice.ico"
+IDI_INCOMING ICON "incoming.ico"
+IDI_OUTGOING ICON "outgoing.ico"
+IDI_NOTICE ICON "notice.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
//
-IDC_HYPERLINKHAND CURSOR "res/hyperlin.cur"
-IDC_DROP CURSOR "res/dragcopy.cur"
-IDC_DROPUSER CURSOR "res/dropuser.cur"
+IDC_HYPERLINKHAND CURSOR "hyperlin.cur"
+IDC_DROP CURSOR "dragcopy.cur"
+IDC_DROPUSER CURSOR "dropuser.cur"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/SRMM/version.rc b/plugins/SRMM/res/version.rc index 0fd0d4c556..9b4b853e11 100644 --- a/plugins/SRMM/version.rc +++ b/plugins/SRMM/res/version.rc @@ -2,8 +2,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include "version.h"
-#include "resource.h"
+#include "..\src\version.h"
#include "winres.h"
#include "richedit.h"
@@ -12,7 +11,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page( 1252)
#endif //_WIN32
-#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
@@ -54,5 +52,3 @@ BEGIN VALUE "Translation", 0x409, 1200
END
END
-
-#endif // !_MAC
diff --git a/plugins/SRMM/cmdlist.cpp b/plugins/SRMM/src/cmdlist.cpp index 91d082fc74..91d082fc74 100644 --- a/plugins/SRMM/cmdlist.cpp +++ b/plugins/SRMM/src/cmdlist.cpp diff --git a/plugins/SRMM/cmdlist.h b/plugins/SRMM/src/cmdlist.h index add3d4987b..add3d4987b 100644 --- a/plugins/SRMM/cmdlist.h +++ b/plugins/SRMM/src/cmdlist.h diff --git a/plugins/SRMM/commonheaders.h b/plugins/SRMM/src/commonheaders.h index d9372700cb..5ab3a6985d 100644 --- a/plugins/SRMM/commonheaders.h +++ b/plugins/SRMM/src/commonheaders.h @@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define WIN32_LEAN_AND_MEAN
+#define _CRT_SECURE_NO_WARNINGS
+
#include <m_stdhdr.h>
#include <windows.h>
diff --git a/plugins/SRMM/globals.cpp b/plugins/SRMM/src/globals.cpp index e6d0175f1c..e6d0175f1c 100644 --- a/plugins/SRMM/globals.cpp +++ b/plugins/SRMM/src/globals.cpp diff --git a/plugins/SRMM/globals.h b/plugins/SRMM/src/globals.h index 05ae138f7d..05ae138f7d 100644 --- a/plugins/SRMM/globals.h +++ b/plugins/SRMM/src/globals.h diff --git a/plugins/SRMM/msgdialog.cpp b/plugins/SRMM/src/msgdialog.cpp index df25b409e0..df25b409e0 100644 --- a/plugins/SRMM/msgdialog.cpp +++ b/plugins/SRMM/src/msgdialog.cpp diff --git a/plugins/SRMM/msglog.cpp b/plugins/SRMM/src/msglog.cpp index d24cda4032..d24cda4032 100644 --- a/plugins/SRMM/msglog.cpp +++ b/plugins/SRMM/src/msglog.cpp diff --git a/plugins/SRMM/msgoptions.cpp b/plugins/SRMM/src/msgoptions.cpp index 6eb91e910f..6eb91e910f 100644 --- a/plugins/SRMM/msgoptions.cpp +++ b/plugins/SRMM/src/msgoptions.cpp diff --git a/plugins/SRMM/msgs.cpp b/plugins/SRMM/src/msgs.cpp index 9bf26a38cb..9bf26a38cb 100644 --- a/plugins/SRMM/msgs.cpp +++ b/plugins/SRMM/src/msgs.cpp diff --git a/plugins/SRMM/msgs.h b/plugins/SRMM/src/msgs.h index 4a02e67a32..4a02e67a32 100644 --- a/plugins/SRMM/msgs.h +++ b/plugins/SRMM/src/msgs.h diff --git a/plugins/SRMM/msgtimedout.cpp b/plugins/SRMM/src/msgtimedout.cpp index 1b1773aa8e..1b1773aa8e 100644 --- a/plugins/SRMM/msgtimedout.cpp +++ b/plugins/SRMM/src/msgtimedout.cpp diff --git a/plugins/SRMM/resource.h b/plugins/SRMM/src/resource.h index 715d83656b..715d83656b 100644 --- a/plugins/SRMM/resource.h +++ b/plugins/SRMM/src/resource.h diff --git a/plugins/SRMM/richutil.cpp b/plugins/SRMM/src/richutil.cpp index 7f77c98fa8..7f77c98fa8 100644 --- a/plugins/SRMM/richutil.cpp +++ b/plugins/SRMM/src/richutil.cpp diff --git a/plugins/SRMM/richutil.h b/plugins/SRMM/src/richutil.h index 68e9f37c5b..68e9f37c5b 100644 --- a/plugins/SRMM/richutil.h +++ b/plugins/SRMM/src/richutil.h diff --git a/plugins/SRMM/srmm.cpp b/plugins/SRMM/src/srmm.cpp index 4ab15c5369..4ab15c5369 100644 --- a/plugins/SRMM/srmm.cpp +++ b/plugins/SRMM/src/srmm.cpp diff --git a/plugins/SRMM/statusicon.cpp b/plugins/SRMM/src/statusicon.cpp index cd7ac3872e..cd7ac3872e 100644 --- a/plugins/SRMM/statusicon.cpp +++ b/plugins/SRMM/src/statusicon.cpp diff --git a/plugins/SRMM/statusicon.h b/plugins/SRMM/src/statusicon.h index 314ac9ec1e..314ac9ec1e 100644 --- a/plugins/SRMM/statusicon.h +++ b/plugins/SRMM/src/statusicon.h diff --git a/plugins/SRMM/version.h b/plugins/SRMM/src/version.h index 58f9cf348c..58f9cf348c 100644 --- a/plugins/SRMM/version.h +++ b/plugins/SRMM/src/version.h diff --git a/plugins/SRMM/srmm_10.vcxproj b/plugins/SRMM/srmm_10.vcxproj index 9f33e54436..9a678a1fdd 100644 --- a/plugins/SRMM/srmm_10.vcxproj +++ b/plugins/SRMM/srmm_10.vcxproj @@ -75,14 +75,13 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
<FloatingPointModel>Fast</FloatingPointModel>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
@@ -110,14 +109,13 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
<FloatingPointModel>Fast</FloatingPointModel>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
@@ -143,7 +141,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -152,7 +150,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
@@ -175,7 +172,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;SRMM_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -183,7 +180,6 @@ <FloatingPointModel>Fast</FloatingPointModel>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
@@ -203,51 +199,31 @@ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="cmdlist.cpp" />
- <ClCompile Include="globals.cpp" />
- <ClCompile Include="msgdialog.cpp" />
- <ClCompile Include="msglog.cpp" />
- <ClCompile Include="msgoptions.cpp" />
- <ClCompile Include="msgs.cpp" />
- <ClCompile Include="msgtimedout.cpp" />
- <ClCompile Include="richutil.cpp" />
- <ClCompile Include="srmm.cpp">
+ <ClCompile Include="src\cmdlist.cpp" />
+ <ClCompile Include="src\globals.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\richutil.cpp" />
+ <ClCompile Include="src\srmm.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="statusicon.cpp" />
+ <ClCompile Include="src\statusicon.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="cmdlist.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="globals.h" />
- <ClInclude Include="msgs.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="richutil.h" />
- <ClInclude Include="statusicon.h" />
+ <ClInclude Include="src\cmdlist.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\globals.h" />
+ <ClInclude Include="src\msgs.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\richutil.h" />
+ <ClInclude Include="src\statusicon.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\Clock32.ico" />
- <None Include="res\Clock8.ico" />
- <None Include="res\Details32.ico" />
- <None Include="res\Details8.ico" />
- <None Include="res\Downarrow32.ico" />
- <None Include="res\Downarrow8.ico" />
- <None Include="res\dragcopy.cur" />
- <None Include="res\dropuser.cur" />
- <None Include="res\History32.ico" />
- <None Include="res\History8.ico" />
- <None Include="res\hyperlin.cur" />
- <None Include="res\incoming.ico" />
- <None Include="res\Multisend32.ico" />
- <None Include="res\Multisend8.ico" />
- <None Include="res\notice.ico" />
- <None Include="res\outgoing.ico" />
- <None Include="res\Typing32.ico" />
- <None Include="res\Typing8.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
- <ResourceCompile Include="version.rc" />
+ <ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/SRMM/srmm_10.vcxproj.filters b/plugins/SRMM/srmm_10.vcxproj.filters index 4be72d8c8d..751ea7199a 100644 --- a/plugins/SRMM/srmm_10.vcxproj.filters +++ b/plugins/SRMM/srmm_10.vcxproj.filters @@ -15,121 +15,65 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="cmdlist.c">
+ <ClCompile Include="src\cmdlist.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="globals.c">
+ <ClCompile Include="src\globals.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgdialog.c">
+ <ClCompile Include="src\msgdialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msglog.c">
+ <ClCompile Include="src\msglog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgoptions.c">
+ <ClCompile Include="src\msgoptions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgs.c">
+ <ClCompile Include="src\msgs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="msgtimedout.c">
+ <ClCompile Include="src\msgtimedout.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="richutil.c">
+ <ClCompile Include="src\richutil.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="srmm.c">
+ <ClCompile Include="src\srmm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="statusicon.c">
+ <ClCompile Include="src\statusicon.cpp">
<Filter>Source Files</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="msgs.h">
+ <ClInclude Include="src\msgs.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="statusicon.h">
+ <ClInclude Include="src\statusicon.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="res\Clock32.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Clock8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Details32.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Details8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Downarrow32.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Downarrow8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\dragcopy.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\dropuser.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\History32.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\History8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\hyperlin.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\incoming.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Multisend32.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Multisend8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\notice.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\outgoing.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Typing32.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Typing8.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/SplashScreen/doc/splash_readme.txt b/plugins/SplashScreen/docs/splash_readme.txt index db4d582699..db4d582699 100644 --- a/plugins/SplashScreen/doc/splash_readme.txt +++ b/plugins/SplashScreen/docs/splash_readme.txt diff --git a/plugins/SplashScreen/splashscreen-translation.txt b/plugins/SplashScreen/docs/splashscreen-translation.txt index 43262cd1d4..43262cd1d4 100644 --- a/plugins/SplashScreen/splashscreen-translation.txt +++ b/plugins/SplashScreen/docs/splashscreen-translation.txt diff --git a/plugins/SplashScreen/doc/todo.txt b/plugins/SplashScreen/docs/todo.txt index f059b805e4..f059b805e4 100644 --- a/plugins/SplashScreen/doc/todo.txt +++ b/plugins/SplashScreen/docs/todo.txt diff --git a/plugins/SplashScreen/src/splash.rc b/plugins/SplashScreen/res/splash.rc index b71eb0a2fd..262d4e1e9c 100644 --- a/plugins/SplashScreen/src/splash.rc +++ b/plugins/SplashScreen/res/splash.rc @@ -1,6 +1,6 @@ //Microsoft Developer Studio generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -120,7 +120,7 @@ LANGUAGE 0x22, 0x1 1 TEXTINCLUDE MOVEABLE PURE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
3 TEXTINCLUDE MOVEABLE PURE
diff --git a/plugins/SplashScreen/src/version.rc b/plugins/SplashScreen/res/version.rc index d1da5e8d6a..d741488c4f 100644 --- a/plugins/SplashScreen/src/version.rc +++ b/plugins/SplashScreen/res/version.rc @@ -5,7 +5,7 @@ #endif //APSTUDIO_INVOKED
#include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/SplashScreen/splashscreen_10.vcxproj b/plugins/SplashScreen/splashscreen_10.vcxproj index b6959031dd..717738031d 100644 --- a/plugins/SplashScreen/splashscreen_10.vcxproj +++ b/plugins/SplashScreen/splashscreen_10.vcxproj @@ -76,7 +76,7 @@ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SPLASH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -104,7 +104,7 @@ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;SPLASH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -129,7 +129,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SPLASH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;SPLASH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -188,13 +188,8 @@ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="src\splash.rc" />
- <ResourceCompile Include="src\version.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="doc\splash_readme.txt" />
- <None Include="doc\splash_translate.txt" />
- <None Include="doc\todo.txt" />
+ <ResourceCompile Include="res\splash.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/SplashScreen/splashscreen_10.vcxproj.filters b/plugins/SplashScreen/splashscreen_10.vcxproj.filters index ac66bfde36..1328973588 100644 --- a/plugins/SplashScreen/splashscreen_10.vcxproj.filters +++ b/plugins/SplashScreen/splashscreen_10.vcxproj.filters @@ -13,12 +13,6 @@ <UniqueIdentifier>{4cf2f797-4e6e-41e0-9836-39dbe0da6295}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Docs">
- <UniqueIdentifier>{3457019d-5df6-405d-82d6-4a50c482396a}</UniqueIdentifier>
- </Filter>
- <Filter Include="API">
- <UniqueIdentifier>{2bc381f4-bd10-4393-9bdd-e2a1ecc95d8d}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\bitmap_funcs.cpp">
@@ -55,22 +49,11 @@ </ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="src\splash.rc">
+ <ResourceCompile Include="res\splash.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="src\version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="doc\splash_readme.txt">
- <Filter>Docs</Filter>
- </None>
- <None Include="doc\splash_translate.txt">
- <Filter>Docs</Filter>
- </None>
- <None Include="doc\todo.txt">
- <Filter>Docs</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file |