From e270295e45b14cd3405d94b1184f4242737c5cf3 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 30 Jul 2012 07:35:09 +0000 Subject: StopSpamMod added to a full solution, unchecked (boost), small projects adjustment git-svn-id: http://svn.miranda-ng.org/main/trunk@1271 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_full.sln | 8 + bin10/mir_full_pro.sln | 9 + plugins/Msg_Export/msg_export_10.vcxproj | 1 + plugins/New_GPG/docs/README | 6 - plugins/New_GPG/docs/new_gpg-readme.txt | 6 + plugins/New_GPG/new_gpg_10.vcxproj | 8 +- plugins/StopSpamMod/README | 5 - plugins/StopSpamMod/docs/stopspam_mod-readme.txt | 5 + plugins/StopSpamMod/stopspam_10.vcxproj | 244 -------------------- plugins/StopSpamMod/stopspam_10.vcxproj.filters | 65 ------ plugins/StopSpamMod/stopspam_mod_10.vcxproj | 249 +++++++++++++++++++++ .../StopSpamMod/stopspam_mod_10.vcxproj.filters | 65 ++++++ 12 files changed, 347 insertions(+), 324 deletions(-) delete mode 100644 plugins/New_GPG/docs/README create mode 100644 plugins/New_GPG/docs/new_gpg-readme.txt delete mode 100755 plugins/StopSpamMod/README create mode 100644 plugins/StopSpamMod/docs/stopspam_mod-readme.txt delete mode 100755 plugins/StopSpamMod/stopspam_10.vcxproj delete mode 100755 plugins/StopSpamMod/stopspam_10.vcxproj.filters create mode 100644 plugins/StopSpamMod/stopspam_mod_10.vcxproj create mode 100644 plugins/StopSpamMod/stopspam_mod_10.vcxproj.filters diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 4420b81b56..01d7cd35a5 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -291,6 +291,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "New_GPG", "..\plugins\New_G EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Msg_Export", "..\plugins\Msg_Export\msg_export_10.vcxproj", "{4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpamMod", "..\plugins\StopSpamMod\stopspam_mod_10.vcxproj", "{0FF6989B-880A-4C3F-B69D-AFF93296044D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1445,6 +1447,12 @@ Global {4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}.Release|Win32.Build.0 = Release|Win32 {4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}.Release|x64.ActiveCfg = Release|x64 {4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}.Release|x64.Build.0 = Release|x64 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|Win32.ActiveCfg = Debug|Win32 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|Win32.Build.0 = Debug|Win32 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|x64.ActiveCfg = Debug|x64 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|x64.Build.0 = Debug|x64 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|Win32.ActiveCfg = Release|Win32 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 572aad6757..9184ecb767 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -327,6 +327,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "New_GPG", "..\plugins\New_G EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Msg_Export", "..\plugins\Msg_Export\msg_export_10.vcxproj", "{4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpamMod", "..\plugins\StopSpamMod\stopspam_mod_10.vcxproj", "{0FF6989B-880A-4C3F-B69D-AFF93296044D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1481,6 +1483,12 @@ Global {4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}.Release|Win32.Build.0 = Release|Win32 {4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}.Release|x64.ActiveCfg = Release|x64 {4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B}.Release|x64.Build.0 = Release|x64 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|Win32.ActiveCfg = Debug|Win32 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|Win32.Build.0 = Debug|Win32 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|x64.ActiveCfg = Debug|x64 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Debug|x64.Build.0 = Debug|x64 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|Win32.ActiveCfg = Release|Win32 + {0FF6989B-880A-4C3F-B69D-AFF93296044D}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1607,6 +1615,7 @@ Global {3E727941-2854-4F64-ADA5-BF3BF104A4A3} = {76177119-A395-4739-AECE-25D4864198AD} {88E47CF7-7B40-4312-A35A-9B28885FFED9} = {76177119-A395-4739-AECE-25D4864198AD} {F29D0C8D-141A-43CF-86B2-34A04653F8D4} = {76177119-A395-4739-AECE-25D4864198AD} + {0FF6989B-880A-4C3F-B69D-AFF93296044D} = {76177119-A395-4739-AECE-25D4864198AD} {66503A70-B1E8-4545-B4FF-2108DFB40C72} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D} {D548A54E-310B-4A86-A545-64BDD5748745} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D} {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D} diff --git a/plugins/Msg_Export/msg_export_10.vcxproj b/plugins/Msg_Export/msg_export_10.vcxproj index b5bf2420a1..1a8d220d4c 100755 --- a/plugins/Msg_Export/msg_export_10.vcxproj +++ b/plugins/Msg_Export/msg_export_10.vcxproj @@ -163,6 +163,7 @@ true true $(IntDir)$(TargetName).lib + true diff --git a/plugins/New_GPG/docs/README b/plugins/New_GPG/docs/README deleted file mode 100644 index be5551c7ac..0000000000 --- a/plugins/New_GPG/docs/README +++ /dev/null @@ -1,6 +0,0 @@ -* Build Dependencies - 1. boost (http://www.boost.org/) - 2. utf8cpp (http://utfcpp.sourceforge.net/) - 3. c++ compiller (because of miranda have compiled with MSVC, only msvc compiled builds working fine (i have no success with mingw, please report your result :) )) -* Runtime Dependencies - 1. MIranda NG diff --git a/plugins/New_GPG/docs/new_gpg-readme.txt b/plugins/New_GPG/docs/new_gpg-readme.txt new file mode 100644 index 0000000000..be5551c7ac --- /dev/null +++ b/plugins/New_GPG/docs/new_gpg-readme.txt @@ -0,0 +1,6 @@ +* Build Dependencies + 1. boost (http://www.boost.org/) + 2. utf8cpp (http://utfcpp.sourceforge.net/) + 3. c++ compiller (because of miranda have compiled with MSVC, only msvc compiled builds working fine (i have no success with mingw, please report your result :) )) +* Runtime Dependencies + 1. MIranda NG diff --git a/plugins/New_GPG/new_gpg_10.vcxproj b/plugins/New_GPG/new_gpg_10.vcxproj index acb29901c4..9478a20409 100755 --- a/plugins/New_GPG/new_gpg_10.vcxproj +++ b/plugins/New_GPG/new_gpg_10.vcxproj @@ -327,7 +327,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib true true true @@ -377,7 +377,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64 true true true @@ -468,7 +468,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib true false @@ -514,7 +514,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64 true false diff --git a/plugins/StopSpamMod/README b/plugins/StopSpamMod/README deleted file mode 100755 index 4f317d214d..0000000000 --- a/plugins/StopSpamMod/README +++ /dev/null @@ -1,5 +0,0 @@ -* Build Dependencies - 1. boost (http://www.boost.org/) - 2. c++ compiller (because of miranda have compiled with MSVC, only msvc compiled builds working fine (i have no success with mingw, please report your result :) )) -* Runtime Dependencies - 1. MIranda IM at least 0.8 (custom builds should be compiled fine against 0.6, 0.7 miranda api) diff --git a/plugins/StopSpamMod/docs/stopspam_mod-readme.txt b/plugins/StopSpamMod/docs/stopspam_mod-readme.txt new file mode 100644 index 0000000000..4f317d214d --- /dev/null +++ b/plugins/StopSpamMod/docs/stopspam_mod-readme.txt @@ -0,0 +1,5 @@ +* Build Dependencies + 1. boost (http://www.boost.org/) + 2. c++ compiller (because of miranda have compiled with MSVC, only msvc compiled builds working fine (i have no success with mingw, please report your result :) )) +* Runtime Dependencies + 1. MIranda IM at least 0.8 (custom builds should be compiled fine against 0.6, 0.7 miranda api) diff --git a/plugins/StopSpamMod/stopspam_10.vcxproj b/plugins/StopSpamMod/stopspam_10.vcxproj deleted file mode 100755 index a412f624a1..0000000000 --- a/plugins/StopSpamMod/stopspam_10.vcxproj +++ /dev/null @@ -1,244 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - stopspam - {3E6CEC79-5E93-4607-B10E-498586ECF6A6} - stopspam - Win32Proj - - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(Configuration)\ - false - false - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - false - false - - - - - - - - Disabled - ..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - $(OutDir)$(ProjectName).dll - true - c:\debug\stopspam.pdb - Windows - false - - - $(OutDir)stopspam.lib - MachineX86 - X:\temp\windows\libs\Boost\lib;$(SolutionDir)\lib - - - - - - - - - Disabled - X:\temp\windows\libs\boost;X:\temp\windows\libs\utf8cpp\include;X:\install\git\miranda\miranda-im\miranda\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - $(OutDir)$(ProjectName).dll - true - $(OutDir)stopspam.pdb - Windows - false - - - $(OutDir)stopspam.lib - X:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) - - - - - - - - - MinSpace - OnlyExplicitInline - X:\install\git\miranda\miranda_ng_svn\plugins\stopspam_mod\src\include;X:\temp\windows\libs\Boost\include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE - true - MultiThreaded - true - - - Level3 - - - Default - 4996;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - true - true - NotSet - - - - - false - - - - - MachineX86 - X:\temp\windows\libs\Boost\lib32;%(AdditionalLibraryDirectories);$(SolutionDir)\lib - - - - - - - - - - - - - MinSpace - OnlyExplicitInline - C:\Program Files\boost\boost_1_34_1\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Level3 - - - Default - 4996;%(DisableSpecificWarnings) - - - $(OutDir)$(ProjectName).dll - true - true - NotSet - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/StopSpamMod/stopspam_10.vcxproj.filters b/plugins/StopSpamMod/stopspam_10.vcxproj.filters deleted file mode 100755 index ae17f570aa..0000000000 --- a/plugins/StopSpamMod/stopspam_10.vcxproj.filters +++ /dev/null @@ -1,65 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/StopSpamMod/stopspam_mod_10.vcxproj b/plugins/StopSpamMod/stopspam_mod_10.vcxproj new file mode 100644 index 0000000000..14d41ccd1e --- /dev/null +++ b/plugins/StopSpamMod/stopspam_mod_10.vcxproj @@ -0,0 +1,249 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + StopSpamMod + {0FF6989B-880A-4C3F-B69D-AFF93296044D} + stopspam + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + Unicode + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + false + false + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + false + false + + + + + + + + Disabled + .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Windows + false + + + $(IntDir)$(TargetName).lib + MachineX86 + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib + + + ..\..\include\msapi + + + + + + + + + Disabled + .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Windows + false + + + $(IntDir)$(TargetName).lib + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64 + + + ..\..\include\msapi + + + + + + + + + Full + OnlyExplicitInline + .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE + true + MultiThreadedDLL + true + + + Level3 + + + Default + 4996;%(DisableSpecificWarnings) + Size + + + true + true + NotSet + true + true + false + + + $(IntDir)$(TargetName).lib + MachineX86 + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib + + + + + + + ..\..\include\msapi + + + + + + + + + Full + OnlyExplicitInline + .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + Level3 + + + Default + 4996;%(DisableSpecificWarnings) + Size + + + true + true + NotSet + true + true + false + + + $(IntDir)$(TargetName).lib + $(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64 + + + + + + + ..\..\include\msapi + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/StopSpamMod/stopspam_mod_10.vcxproj.filters b/plugins/StopSpamMod/stopspam_mod_10.vcxproj.filters new file mode 100644 index 0000000000..ae17f570aa --- /dev/null +++ b/plugins/StopSpamMod/stopspam_mod_10.vcxproj.filters @@ -0,0 +1,65 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Resource Files + + + \ No newline at end of file -- cgit v1.2.3