From 60b4ba00fcfa8102a050bc7d5e131d08b85e9dc6 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 1 Aug 2015 16:32:19 +0000 Subject: splashscreen: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14779 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- bin14/mir_dev.sln | 2 +- bin14/mir_full.sln | 2 +- build/vc.common/common.props | 2 +- plugins/SplashScreen/splashscreen.vcxproj | 28 +++ plugins/SplashScreen/splashscreen.vcxproj.filters | 4 + plugins/SplashScreen/splashscreen_10.vcxproj | 214 -------------------- .../SplashScreen/splashscreen_10.vcxproj.filters | 62 ------ plugins/SplashScreen/splashscreen_12.vcxproj | 217 --------------------- .../SplashScreen/splashscreen_12.vcxproj.filters | 62 ------ plugins/SplashScreen/splashscreen_14.vcxproj | 217 --------------------- .../SplashScreen/splashscreen_14.vcxproj.filters | 62 ------ plugins/SplashScreen/src/bitmap_funcs.cpp | 2 +- plugins/SplashScreen/src/headers.h | 82 -------- plugins/SplashScreen/src/main.cpp | 2 +- plugins/SplashScreen/src/options.cpp | 2 +- plugins/SplashScreen/src/services.cpp | 2 +- plugins/SplashScreen/src/splash.cpp | 2 +- plugins/SplashScreen/src/stdafx.cpp | 18 -- plugins/SplashScreen/src/stdafx.cxx | 18 ++ plugins/SplashScreen/src/stdafx.h | 82 ++++++++ 25 files changed, 145 insertions(+), 947 deletions(-) create mode 100644 plugins/SplashScreen/splashscreen.vcxproj create mode 100644 plugins/SplashScreen/splashscreen.vcxproj.filters delete mode 100644 plugins/SplashScreen/splashscreen_10.vcxproj delete mode 100644 plugins/SplashScreen/splashscreen_10.vcxproj.filters delete mode 100644 plugins/SplashScreen/splashscreen_12.vcxproj delete mode 100644 plugins/SplashScreen/splashscreen_12.vcxproj.filters delete mode 100644 plugins/SplashScreen/splashscreen_14.vcxproj delete mode 100644 plugins/SplashScreen/splashscreen_14.vcxproj.filters delete mode 100644 plugins/SplashScreen/src/headers.h delete mode 100644 plugins/SplashScreen/src/stdafx.cpp create mode 100644 plugins/SplashScreen/src/stdafx.cxx create mode 100644 plugins/SplashScreen/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index a81b494118..8bbf81fa52 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -104,7 +104,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "..\plugins\Simp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\SmileyAdd\SmileyAdd.vcxproj", "{5BBA7E51-B494-4462-BC4F-1AE5F57F9857}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen_10.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_10.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index bd6dffca6c..9172823a4e 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -104,7 +104,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "..\plugins\Simp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\SmileyAdd\SmileyAdd.vcxproj", "{5BBA7E51-B494-4462-BC4F-1AE5F57F9857}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen_10.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_10.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 4c3d56eed6..d81e873459 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -104,7 +104,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "..\plugins\Simp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\SmileyAdd\SmileyAdd.vcxproj", "{5BBA7E51-B494-4462-BC4F-1AE5F57F9857}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen_10.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_10.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index 5832d49aa0..d444f9b6d4 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -106,7 +106,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "..\plugins\Simp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\SmileyAdd\SmileyAdd.vcxproj", "{5BBA7E51-B494-4462-BC4F-1AE5F57F9857}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen_12.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_12.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index e48939a3f5..45a8fde737 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -106,7 +106,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "..\plugins\Simp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\SmileyAdd\SmileyAdd.vcxproj", "{5BBA7E51-B494-4462-BC4F-1AE5F57F9857}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen_12.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_12.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}" EndProject diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index 796e83d88f..7d59ea6840 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -106,7 +106,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "..\plugins\Simp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\SmileyAdd\SmileyAdd.vcxproj", "{5BBA7E51-B494-4462-BC4F-1AE5F57F9857}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen_14.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_14.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}" EndProject diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index aa085ff571..9b022fae2a 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -106,7 +106,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "..\plugins\Simp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\SmileyAdd\SmileyAdd.vcxproj", "{5BBA7E51-B494-4462-BC4F-1AE5F57F9857}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen_14.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_14.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}" EndProject diff --git a/build/vc.common/common.props b/build/vc.common/common.props index 48ced53e34..16b02d93eb 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -34,7 +34,7 @@ false - gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) + Strmiids.lib;gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) $(CommonLibDir) true false diff --git a/plugins/SplashScreen/splashscreen.vcxproj b/plugins/SplashScreen/splashscreen.vcxproj new file mode 100644 index 0000000000..719404c874 --- /dev/null +++ b/plugins/SplashScreen/splashscreen.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SplashScreen + {5A6095F4-B037-4DA8-8410-8004A90C961A} + + + + + \ No newline at end of file diff --git a/plugins/SplashScreen/splashscreen.vcxproj.filters b/plugins/SplashScreen/splashscreen.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/SplashScreen/splashscreen.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/SplashScreen/splashscreen_10.vcxproj b/plugins/SplashScreen/splashscreen_10.vcxproj deleted file mode 100644 index ce5f451814..0000000000 --- a/plugins/SplashScreen/splashscreen_10.vcxproj +++ /dev/null @@ -1,214 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - SplashScreen - {5A6095F4-B037-4DA8-8410-8004A90C961A} - - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Level3 - false - Use - headers.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - true - true - 0x16660000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Level3 - false - Use - headers.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - true - true - 0x16660000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - false - Use - headers.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x16660000 - $(ProfileDir)..\..\bin10\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - false - Use - headers.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x16660000 - $(ProfileDir)..\..\bin10\lib - - - - - - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/SplashScreen/splashscreen_10.vcxproj.filters b/plugins/SplashScreen/splashscreen_10.vcxproj.filters deleted file mode 100644 index 9997a8ad8d..0000000000 --- a/plugins/SplashScreen/splashscreen_10.vcxproj.filters +++ /dev/null @@ -1,62 +0,0 @@ - - - - - {76360dd5-cc6d-4d5d-b034-eacc85210c07} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {4f8b92ac-9157-49e1-86e1-89b6a5bedd06} - h;hpp;hxx;hm;inl - - - {4cf2f797-4e6e-41e0-9836-39dbe0da6295} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/SplashScreen/splashscreen_12.vcxproj b/plugins/SplashScreen/splashscreen_12.vcxproj deleted file mode 100644 index a6bf4123e6..0000000000 --- a/plugins/SplashScreen/splashscreen_12.vcxproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - SplashScreen - {5A6095F4-B037-4DA8-8410-8004A90C961A} - - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Level4 - false - Use - headers.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - true - true - 0x16660000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Level4 - false - Use - headers.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - true - true - 0x16660000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - false - Use - headers.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x16660000 - $(ProfileDir)..\..\bin12\lib - false - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level4 - false - Use - headers.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x16660000 - $(ProfileDir)..\..\bin12\lib - - - - - - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/SplashScreen/splashscreen_12.vcxproj.filters b/plugins/SplashScreen/splashscreen_12.vcxproj.filters deleted file mode 100644 index 9997a8ad8d..0000000000 --- a/plugins/SplashScreen/splashscreen_12.vcxproj.filters +++ /dev/null @@ -1,62 +0,0 @@ - - - - - {76360dd5-cc6d-4d5d-b034-eacc85210c07} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {4f8b92ac-9157-49e1-86e1-89b6a5bedd06} - h;hpp;hxx;hm;inl - - - {4cf2f797-4e6e-41e0-9836-39dbe0da6295} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/SplashScreen/splashscreen_14.vcxproj b/plugins/SplashScreen/splashscreen_14.vcxproj deleted file mode 100644 index 695970ca75..0000000000 --- a/plugins/SplashScreen/splashscreen_14.vcxproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - SplashScreen - {5A6095F4-B037-4DA8-8410-8004A90C961A} - - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Level4 - false - Use - headers.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - true - true - 0x16660000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Level4 - false - Use - headers.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - true - true - 0x16660000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - false - Use - headers.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x16660000 - $(ProfileDir)..\..\bin14\lib - false - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level4 - false - Use - headers.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Strmiids.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x16660000 - $(ProfileDir)..\..\bin14\lib - - - - - - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/SplashScreen/splashscreen_14.vcxproj.filters b/plugins/SplashScreen/splashscreen_14.vcxproj.filters deleted file mode 100644 index 9997a8ad8d..0000000000 --- a/plugins/SplashScreen/splashscreen_14.vcxproj.filters +++ /dev/null @@ -1,62 +0,0 @@ - - - - - {76360dd5-cc6d-4d5d-b034-eacc85210c07} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {4f8b92ac-9157-49e1-86e1-89b6a5bedd06} - h;hpp;hxx;hm;inl - - - {4cf2f797-4e6e-41e0-9836-39dbe0da6295} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/SplashScreen/src/bitmap_funcs.cpp b/plugins/SplashScreen/src/bitmap_funcs.cpp index e75395e838..5359adc3d2 100644 --- a/plugins/SplashScreen/src/bitmap_funcs.cpp +++ b/plugins/SplashScreen/src/bitmap_funcs.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" MyBitmap::MyBitmap() { diff --git a/plugins/SplashScreen/src/headers.h b/plugins/SplashScreen/src/headers.h deleted file mode 100644 index 070026efa2..0000000000 --- a/plugins/SplashScreen/src/headers.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - Splash Screen Plugin for Miranda NG (www.miranda-ng.org) - (c) 2004-2007 nullbie, (c) 2005-2007 Thief - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef HEADERS_H -#define HEADERS_H - -#define _CRT_SECURE_NO_DEPRECATE - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "version.h" -#include "resource.h" -#include "bitmap_funcs.h" - -#ifdef _DEBUG - #include - #include - #include "debug.h" -#endif - -// Internal defines -#define SPLASH_CLASS "MirandaSplash" -#define MODNAME "SplashScreen" -#define WM_LOADED (WM_USER + 10) - -struct SPLASHOPTS -{ - byte active; - byte playsnd; - byte fadein; - byte fadeout; - byte inheritGS; //??? - byte random; - byte showversion; - int showtime; - int fosteps; - int fisteps; -}; - -extern HWND hwndSplash; -extern SPLASHOPTS options; -extern TCHAR szSplashFile[MAX_PATH], szSoundFile[MAX_PATH], szPrefix[128]; -extern TCHAR *szMirDir; -extern char szVersion[MAX_PATH]; -extern BOOL bserviceinvoked, bmodulesloaded, png2dibavail; -extern HINSTANCE hInst; - -extern int OptInit(WPARAM wParam, LPARAM lParam); -extern BOOL ShowSplash(BOOL bpreview); -extern VOID ReadDbConfig(); -extern INT_PTR ShowSplashService(WPARAM wparam,LPARAM lparam); - -#endif //HEADERS_H diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 26e362ab92..4f7007a5ab 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" CLIST_INTERFACE *pcli; HINSTANCE hInst = 0; diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index 5771ec58de..95a3f09e75 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" TCHAR szPath2Spash[MAX_PATH], szSoundFilePath[MAX_PATH]; diff --git a/plugins/SplashScreen/src/services.cpp b/plugins/SplashScreen/src/services.cpp index beecc04357..6e3497cb6d 100644 --- a/plugins/SplashScreen/src/services.cpp +++ b/plugins/SplashScreen/src/services.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" INT_PTR ShowSplashService(WPARAM wparam, LPARAM lparam) { diff --git a/plugins/SplashScreen/src/splash.cpp b/plugins/SplashScreen/src/splash.cpp index cfbb7b88b4..df0f3367e9 100644 --- a/plugins/SplashScreen/src/splash.cpp +++ b/plugins/SplashScreen/src/splash.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" BOOL bpreviewruns; MyBitmap *SplashBmp, *tmpBmp; diff --git a/plugins/SplashScreen/src/stdafx.cpp b/plugins/SplashScreen/src/stdafx.cpp deleted file mode 100644 index 7e0216078c..0000000000 --- a/plugins/SplashScreen/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "headers.h" \ No newline at end of file diff --git a/plugins/SplashScreen/src/stdafx.cxx b/plugins/SplashScreen/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/SplashScreen/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/SplashScreen/src/stdafx.h b/plugins/SplashScreen/src/stdafx.h new file mode 100644 index 0000000000..070026efa2 --- /dev/null +++ b/plugins/SplashScreen/src/stdafx.h @@ -0,0 +1,82 @@ +/* + Splash Screen Plugin for Miranda NG (www.miranda-ng.org) + (c) 2004-2007 nullbie, (c) 2005-2007 Thief + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef HEADERS_H +#define HEADERS_H + +#define _CRT_SECURE_NO_DEPRECATE + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "version.h" +#include "resource.h" +#include "bitmap_funcs.h" + +#ifdef _DEBUG + #include + #include + #include "debug.h" +#endif + +// Internal defines +#define SPLASH_CLASS "MirandaSplash" +#define MODNAME "SplashScreen" +#define WM_LOADED (WM_USER + 10) + +struct SPLASHOPTS +{ + byte active; + byte playsnd; + byte fadein; + byte fadeout; + byte inheritGS; //??? + byte random; + byte showversion; + int showtime; + int fosteps; + int fisteps; +}; + +extern HWND hwndSplash; +extern SPLASHOPTS options; +extern TCHAR szSplashFile[MAX_PATH], szSoundFile[MAX_PATH], szPrefix[128]; +extern TCHAR *szMirDir; +extern char szVersion[MAX_PATH]; +extern BOOL bserviceinvoked, bmodulesloaded, png2dibavail; +extern HINSTANCE hInst; + +extern int OptInit(WPARAM wParam, LPARAM lParam); +extern BOOL ShowSplash(BOOL bpreview); +extern VOID ReadDbConfig(); +extern INT_PTR ShowSplashService(WPARAM wparam,LPARAM lparam); + +#endif //HEADERS_H -- cgit v1.2.3