From 7d5be7defe163d9310b98d621dc0de29116a08df Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 25 Jul 2015 19:18:08 +0000 Subject: MsgPopup: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14701 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/MsgPopup/MsgPopup.vcxproj | 28 ++++ plugins/MsgPopup/MsgPopup.vcxproj.filters | 4 + plugins/MsgPopup/MsgPopup_10.vcxproj | 204 -------------------------- plugins/MsgPopup/MsgPopup_10.vcxproj.filters | 50 ------- plugins/MsgPopup/MsgPopup_12.vcxproj | 209 --------------------------- plugins/MsgPopup/MsgPopup_12.vcxproj.filters | 50 ------- plugins/MsgPopup/MsgPopup_14.vcxproj | 209 --------------------------- plugins/MsgPopup/MsgPopup_14.vcxproj.filters | 50 ------- plugins/MsgPopup/src/common.h | 51 ------- plugins/MsgPopup/src/main.cpp | 2 +- plugins/MsgPopup/src/options.cpp | 2 +- plugins/MsgPopup/src/stdafx.cpp | 18 --- plugins/MsgPopup/src/stdafx.cxx | 18 +++ plugins/MsgPopup/src/stdafx.h | 51 +++++++ 22 files changed, 111 insertions(+), 851 deletions(-) create mode 100644 plugins/MsgPopup/MsgPopup.vcxproj create mode 100644 plugins/MsgPopup/MsgPopup.vcxproj.filters delete mode 100644 plugins/MsgPopup/MsgPopup_10.vcxproj delete mode 100644 plugins/MsgPopup/MsgPopup_10.vcxproj.filters delete mode 100644 plugins/MsgPopup/MsgPopup_12.vcxproj delete mode 100644 plugins/MsgPopup/MsgPopup_12.vcxproj.filters delete mode 100644 plugins/MsgPopup/MsgPopup_14.vcxproj delete mode 100644 plugins/MsgPopup/MsgPopup_14.vcxproj.filters delete mode 100644 plugins/MsgPopup/src/common.h delete mode 100644 plugins/MsgPopup/src/stdafx.cpp create mode 100644 plugins/MsgPopup/src/stdafx.cxx create mode 100644 plugins/MsgPopup/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 89639d2f2c..405e558150 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -349,7 +349,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyPounce", "..\plugins\BuddyPounce\buddypounce.vcxproj", "{FBC473A7-6383-4C9F-A8FD-282A3CC44FD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup_10.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSoundNotify", "..\plugins\XSoundNotify\XSoundNotify_10.vcxproj", "{5935CC24-A1C9-4CF9-8B1C-1AA2321627DE}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 31301ce068..5bd57075cc 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -356,7 +356,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyPounce", "..\plugins\BuddyPounce\buddypounce.vcxproj", "{FBC473A7-6383-4C9F-A8FD-282A3CC44FD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup_10.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NimContact", "..\plugins\Non-IM Contact\nimcontact_10.vcxproj", "{A556E0B5-73A1-4676-BA1F-133820DE7D5A}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 6f73be83ff..8897350126 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -390,7 +390,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyPounce", "..\plugins\BuddyPounce\buddypounce.vcxproj", "{FBC473A7-6383-4C9F-A8FD-282A3CC44FD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup_10.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSoundNotify", "..\plugins\XSoundNotify\XSoundNotify_10.vcxproj", "{5935CC24-A1C9-4CF9-8B1C-1AA2321627DE}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index bc3712990d..b96c050f16 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -356,7 +356,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyPounce", "..\plugins\BuddyPounce\buddypounce.vcxproj", "{FBC473A7-6383-4C9F-A8FD-282A3CC44FD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup_12.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSoundNotify", "..\plugins\XSoundNotify\XSoundNotify_12.vcxproj", "{5935CC24-A1C9-4CF9-8B1C-1AA2321627DE}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index ff2ae5a7c2..d162b310b3 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -358,7 +358,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyPounce", "..\plugins\BuddyPounce\buddypounce.vcxproj", "{FBC473A7-6383-4C9F-A8FD-282A3CC44FD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup_12.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NimContact", "..\plugins\Non-IM Contact\nimcontact_12.vcxproj", "{A556E0B5-73A1-4676-BA1F-133820DE7D5A}" EndProject diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index 512f5de104..dd8e770f1b 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -356,7 +356,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyPounce", "..\plugins\BuddyPounce\buddypounce.vcxproj", "{FBC473A7-6383-4C9F-A8FD-282A3CC44FD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup_14.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSoundNotify", "..\plugins\XSoundNotify\XSoundNotify_14.vcxproj", "{5935CC24-A1C9-4CF9-8B1C-1AA2321627DE}" EndProject diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index 7b86b412ea..bd32a4d621 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -358,7 +358,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyPounce", "..\plugins\BuddyPounce\buddypounce.vcxproj", "{FBC473A7-6383-4C9F-A8FD-282A3CC44FD1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup_14.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsgPopup", "..\plugins\MsgPopup\MsgPopup.vcxproj", "{1E702CF1-E52F-49F8-915A-FCBBCE554774}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NimContact", "..\plugins\Non-IM Contact\nimcontact_14.vcxproj", "{A556E0B5-73A1-4676-BA1F-133820DE7D5A}" EndProject diff --git a/build/vc.common/common.props b/build/vc.common/common.props index 05f999d5a4..efac22191b 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -34,7 +34,7 @@ false - Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) + dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) $(CommonLibDir) true false diff --git a/plugins/MsgPopup/MsgPopup.vcxproj b/plugins/MsgPopup/MsgPopup.vcxproj new file mode 100644 index 0000000000..aed95b7496 --- /dev/null +++ b/plugins/MsgPopup/MsgPopup.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1E702CF1-E52F-49F8-915A-FCBBCE554774} + MsgPopup + + + + + \ No newline at end of file diff --git a/plugins/MsgPopup/MsgPopup.vcxproj.filters b/plugins/MsgPopup/MsgPopup.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/MsgPopup/MsgPopup.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/MsgPopup/MsgPopup_10.vcxproj b/plugins/MsgPopup/MsgPopup_10.vcxproj deleted file mode 100644 index 91dfe65993..0000000000 --- a/plugins/MsgPopup/MsgPopup_10.vcxproj +++ /dev/null @@ -1,204 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1E702CF1-E52F-49F8-915A-FCBBCE554774} - MsgPopup - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.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 - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - true - EditAndContinue - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - ..\..\include;%(AdditionalIncludeDirectories) - Use - common.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - false - dbghelp.lib;%(AdditionalDependencies) - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - ProgramDatabase - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - ..\..\include;%(AdditionalIncludeDirectories) - Use - common.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - false - dbghelp.lib;%(AdditionalDependencies) - - - - - true - true - Full - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;%(AdditionalIncludeDirectories) - Size - Use - common.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - false - true - true - true - /PDBALTPATH:%_PDB% %(AdditionalOptions) - dbghelp.lib;%(AdditionalDependencies) - - - - - true - true - Full - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;%(AdditionalIncludeDirectories) - Size - Use - common.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - false - true - true - true - /PDBALTPATH:%_PDB% %(AdditionalOptions) - dbghelp.lib;%(AdditionalDependencies) - - - - - - - - - - - - - Create - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MsgPopup/MsgPopup_10.vcxproj.filters b/plugins/MsgPopup/MsgPopup_10.vcxproj.filters deleted file mode 100644 index 4ea916aa95..0000000000 --- a/plugins/MsgPopup/MsgPopup_10.vcxproj.filters +++ /dev/null @@ -1,50 +0,0 @@ - - - - - {f483e746-3653-4929-887e-f79771cb81d9} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {c09436c7-f2f3-4466-8985-3b1de6be34e0} - h;hpp;hxx;hm;inl - - - {dfa4551f-3ded-444a-8b03-f2a42739761e} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MsgPopup/MsgPopup_12.vcxproj b/plugins/MsgPopup/MsgPopup_12.vcxproj deleted file mode 100644 index 7e12695237..0000000000 --- a/plugins/MsgPopup/MsgPopup_12.vcxproj +++ /dev/null @@ -1,209 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1E702CF1-E52F-49F8-915A-FCBBCE554774} - MsgPopup - - - - DynamicLibrary - v120_xp - Unicode - true - - - DynamicLibrary - v120_xp - Unicode - true - - - DynamicLibrary - v120_xp - Unicode - - - DynamicLibrary - v120_xp - Unicode - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.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 - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - true - EditAndContinue - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - ..\..\include;%(AdditionalIncludeDirectories) - Use - common.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - dbghelp.lib;%(AdditionalDependencies) - false - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - ProgramDatabase - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - ..\..\include;%(AdditionalIncludeDirectories) - Use - common.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - dbghelp.lib;%(AdditionalDependencies) - - - - - true - true - Full - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;%(AdditionalIncludeDirectories) - Size - Use - common.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - true - true - true - /PDBALTPATH:%_PDB% %(AdditionalOptions) - dbghelp.lib;%(AdditionalDependencies) - - - - - true - true - Full - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;%(AdditionalIncludeDirectories) - Size - Use - common.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - true - true - true - /PDBALTPATH:%_PDB% %(AdditionalOptions) - dbghelp.lib;%(AdditionalDependencies) - - - - - - - - - - - - - Create - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MsgPopup/MsgPopup_12.vcxproj.filters b/plugins/MsgPopup/MsgPopup_12.vcxproj.filters deleted file mode 100644 index 4ea916aa95..0000000000 --- a/plugins/MsgPopup/MsgPopup_12.vcxproj.filters +++ /dev/null @@ -1,50 +0,0 @@ - - - - - {f483e746-3653-4929-887e-f79771cb81d9} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {c09436c7-f2f3-4466-8985-3b1de6be34e0} - h;hpp;hxx;hm;inl - - - {dfa4551f-3ded-444a-8b03-f2a42739761e} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MsgPopup/MsgPopup_14.vcxproj b/plugins/MsgPopup/MsgPopup_14.vcxproj deleted file mode 100644 index 3066f7a30d..0000000000 --- a/plugins/MsgPopup/MsgPopup_14.vcxproj +++ /dev/null @@ -1,209 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1E702CF1-E52F-49F8-915A-FCBBCE554774} - MsgPopup - - - - DynamicLibrary - v140_xp - Unicode - true - - - DynamicLibrary - v140_xp - Unicode - true - - - DynamicLibrary - v140_xp - Unicode - - - DynamicLibrary - v140_xp - Unicode - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.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 - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - true - EditAndContinue - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - ..\..\include;%(AdditionalIncludeDirectories) - Use - common.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib - false - dbghelp.lib;%(AdditionalDependencies) - false - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - ProgramDatabase - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - ..\..\include;%(AdditionalIncludeDirectories) - Use - common.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib - false - dbghelp.lib;%(AdditionalDependencies) - - - - - true - true - Full - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;%(AdditionalIncludeDirectories) - Size - Use - common.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib - false - true - true - true - /PDBALTPATH:%_PDB% %(AdditionalOptions) - dbghelp.lib;%(AdditionalDependencies) - - - - - true - true - Full - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;%(AdditionalIncludeDirectories) - Size - Use - common.h - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin14\lib - false - true - true - true - /PDBALTPATH:%_PDB% %(AdditionalOptions) - dbghelp.lib;%(AdditionalDependencies) - - - - - - - - - - - - - Create - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MsgPopup/MsgPopup_14.vcxproj.filters b/plugins/MsgPopup/MsgPopup_14.vcxproj.filters deleted file mode 100644 index 4ea916aa95..0000000000 --- a/plugins/MsgPopup/MsgPopup_14.vcxproj.filters +++ /dev/null @@ -1,50 +0,0 @@ - - - - - {f483e746-3653-4929-887e-f79771cb81d9} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {c09436c7-f2f3-4466-8985-3b1de6be34e0} - h;hpp;hxx;hm;inl - - - {dfa4551f-3ded-444a-8b03-f2a42739761e} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MsgPopup/src/common.h b/plugins/MsgPopup/src/common.h deleted file mode 100644 index 6f7192aca2..0000000000 --- a/plugins/MsgPopup/src/common.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - -MessagePopup - replacer of MessageBox'es - -Copyright 2004 Denis Stanishevskiy - -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. - -*/ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "options.h" -#include "resource.h" -#include "Version.h" - -#define SERVICENAME "MessagePopup" - -struct MSGBOXOPTIONS -{ - COLORREF FG[4]; - COLORREF BG[4]; - int Timeout[4]; - BOOL Sound; -}; - -extern MSGBOXOPTIONS options; -extern MSGBOXOPTIONS optionsDefault; - -void LoadConfig(); diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index 1bbfba97a2..c04f171573 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" HINSTANCE hInst; int hLangpack; diff --git a/plugins/MsgPopup/src/options.cpp b/plugins/MsgPopup/src/options.cpp index a57f74a925..ab987af80d 100644 --- a/plugins/MsgPopup/src/options.cpp +++ b/plugins/MsgPopup/src/options.cpp @@ -19,7 +19,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 "common.h" +#include "stdafx.h" int idOptionControls[4][3] = { IDC_ASTERISK_FG, IDC_ASTERISK_BG, IDC_TIMEOUT1, diff --git a/plugins/MsgPopup/src/stdafx.cpp b/plugins/MsgPopup/src/stdafx.cpp deleted file mode 100644 index c5fe5abaad..0000000000 --- a/plugins/MsgPopup/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 "common.h" \ No newline at end of file diff --git a/plugins/MsgPopup/src/stdafx.cxx b/plugins/MsgPopup/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/MsgPopup/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/MsgPopup/src/stdafx.h b/plugins/MsgPopup/src/stdafx.h new file mode 100644 index 0000000000..6f7192aca2 --- /dev/null +++ b/plugins/MsgPopup/src/stdafx.h @@ -0,0 +1,51 @@ +/* + +MessagePopup - replacer of MessageBox'es + +Copyright 2004 Denis Stanishevskiy + +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. + +*/ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "options.h" +#include "resource.h" +#include "Version.h" + +#define SERVICENAME "MessagePopup" + +struct MSGBOXOPTIONS +{ + COLORREF FG[4]; + COLORREF BG[4]; + int Timeout[4]; + BOOL Sound; +}; + +extern MSGBOXOPTIONS options; +extern MSGBOXOPTIONS optionsDefault; + +void LoadConfig(); -- cgit v1.2.3