From dca0e0ddd70216e068e98f13e7df2c5517ff0164 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 14 Jun 2013 19:15:12 +0000 Subject: precompiled headers git-svn-id: http://svn.miranda-ng.org/main/trunk@4946 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/Skype_10.vcxproj | 78 ++++++++++++++++++++++++++++---- protocols/Skype/Skype_10.vcxproj.filters | 8 ++-- protocols/Skype/Skype_11.vcxproj | 78 ++++++++++++++++++++++++++++---- protocols/Skype/Skype_11.vcxproj.filters | 3 ++ protocols/Skype/src/skype.cpp | 2 +- protocols/Skype/src/skype.h | 21 ++++++++- protocols/Skype/src/skype_account.cpp | 2 +- protocols/Skype/src/skype_avatars.cpp | 2 +- protocols/Skype/src/skype_chat.cpp | 4 +- protocols/Skype/src/skype_contacts.cpp | 2 +- protocols/Skype/src/skype_database.cpp | 2 +- protocols/Skype/src/skype_dialogs.cpp | 2 +- protocols/Skype/src/skype_events.cpp | 2 +- protocols/Skype/src/skype_hooks.cpp | 2 +- protocols/Skype/src/skype_icons.cpp | 2 +- protocols/Skype/src/skype_instances.cpp | 2 +- protocols/Skype/src/skype_menus.cpp | 2 +- protocols/Skype/src/skype_messages.cpp | 2 +- protocols/Skype/src/skype_netlib.cpp | 2 +- protocols/Skype/src/skype_own_info.cpp | 2 +- protocols/Skype/src/skype_profile.cpp | 2 +- protocols/Skype/src/skype_proto.cpp | 2 +- protocols/Skype/src/skype_proto.h | 16 ------- protocols/Skype/src/skype_runtime.cpp | 2 +- protocols/Skype/src/skype_services.cpp | 2 +- protocols/Skype/src/skype_skype.cpp | 2 +- protocols/Skype/src/skype_transfers.cpp | 2 +- protocols/Skype/src/skype_utils.cpp | 2 +- protocols/Skype/src/stdafx.cpp | 1 + 29 files changed, 184 insertions(+), 67 deletions(-) create mode 100644 protocols/Skype/src/stdafx.cpp diff --git a/protocols/Skype/Skype_10.vcxproj b/protocols/Skype/Skype_10.vcxproj index 834aa59e98..39b1927e8b 100644 --- a/protocols/Skype/Skype_10.vcxproj +++ b/protocols/Skype/Skype_10.vcxproj @@ -84,7 +84,8 @@ 4996;%(DisableSpecificWarnings) MultiThreadedDebugDLL $(IntDir)/%(RelativeDir)/ - afxres.h + skype.h + Use Windows @@ -112,6 +113,8 @@ true 4996;%(DisableSpecificWarnings) MultiThreadedDebugDLL + Use + skype.h Windows @@ -138,6 +141,8 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;SKYPE_EXPORTS;%(PreprocessorDefinitions) ..\..\include;..\..\plugins\ExternalAPI;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\..\SkypeKit\SDK\ipc\cpp;..\..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + Use + skype.h Windows @@ -164,6 +169,8 @@ NDEBUG;_WINDOWS;_USRDLL;SKYPE_EXPORTS;%(PreprocessorDefinitions) ..\..\include;..\..\plugins\ExternalAPI;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\..\SkypeKit\SDK\ipc\cpp;..\..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + Use + skype.h Windows @@ -200,16 +207,61 @@ - + + NotUsing + NotUsing + NotUsing + NotUsing + - - - - - - - - + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + @@ -231,6 +283,12 @@ + + Create + Create + Create + Create + diff --git a/protocols/Skype/Skype_10.vcxproj.filters b/protocols/Skype/Skype_10.vcxproj.filters index 8c14493215..89bd5c501e 100644 --- a/protocols/Skype/Skype_10.vcxproj.filters +++ b/protocols/Skype/Skype_10.vcxproj.filters @@ -117,6 +117,9 @@ Source Files + + Source Files + @@ -205,9 +208,4 @@ Resource Files\Icons - - - Resource Files\Icons - - \ No newline at end of file diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj index 32b126ac9a..2fc763ab79 100644 --- a/protocols/Skype/Skype_11.vcxproj +++ b/protocols/Skype/Skype_11.vcxproj @@ -88,7 +88,8 @@ 4996;%(DisableSpecificWarnings) MultiThreadedDebugDLL $(IntDir)\%(RelativeDir)\ - afxres.h + skype.h + Use Windows @@ -117,6 +118,8 @@ 4996;%(DisableSpecificWarnings) MultiThreadedDebugDLL $(IntDir)\%(RelativeDir)\ + Use + skype.h Windows @@ -144,6 +147,8 @@ ..\..\include;..\..\plugins\ExternalAPI;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\..\SkypeKit\SDK\ipc\cpp;..\..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) $(IntDir)\%(RelativeDir)\ + Use + skype.h Windows @@ -170,6 +175,8 @@ ..\..\include;..\..\plugins\ExternalAPI;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\..\SkypeKit\SDK\ipc\cpp;..\..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) $(IntDir)\%(RelativeDir)\ + Use + skype.h Windows @@ -205,16 +212,61 @@ - + + NotUsing + NotUsing + NotUsing + NotUsing + - - - - - - - - + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + @@ -236,6 +288,12 @@ + + Create + Create + Create + Create + diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters index 8c14493215..7c590b924d 100644 --- a/protocols/Skype/Skype_11.vcxproj.filters +++ b/protocols/Skype/Skype_11.vcxproj.filters @@ -117,6 +117,9 @@ Source Files + + Source Files + diff --git a/protocols/Skype/src/skype.cpp b/protocols/Skype/src/skype.cpp index 04bed2caeb..423a216eaf 100644 --- a/protocols/Skype/src/skype.cpp +++ b/protocols/Skype/src/skype.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" int hLangpack; HINSTANCE g_hInstance; diff --git a/protocols/Skype/src/skype.h b/protocols/Skype/src/skype.h index 883be3ecd8..ffa6f36ce2 100644 --- a/protocols/Skype/src/skype.h +++ b/protocols/Skype/src/skype.h @@ -10,7 +10,11 @@ #include #include +#include +#include + #include +#include #include #include #include @@ -30,12 +34,11 @@ #include #include #include -#include +#include #include #include #include #include - #include #include "resource.h" @@ -70,6 +73,20 @@ #define SMI_CHAT_INVITE 1 +#include "string_list.h" + +#include "skypekit\common.h" +#include "skypekit\group.h" +#include "skypekit\search.h" +#include "skypekit\account.h" +#include "skypekit\contact.h" +#include "skypekit\message.h" +#include "skypekit\transfer.h" +#include "skypekit\participant.h" +#include "skypekit\conversation.h" + +#include "skype_proto.h" + extern HINSTANCE g_hInstance; extern int g_cbCountries; diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp index 728bcc2750..a4b49637df 100644 --- a/protocols/Skype/src/skype_account.cpp +++ b/protocols/Skype/src/skype_account.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" wchar_t *CSkypeProto::LogoutReasons[] = { diff --git a/protocols/Skype/src/skype_avatars.cpp b/protocols/Skype/src/skype_avatars.cpp index b44cb2cb66..867b20f537 100644 --- a/protocols/Skype/src/skype_avatars.cpp +++ b/protocols/Skype/src/skype_avatars.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" bool CSkypeProto::IsAvatarChanged(const SEBinary &avatar, HANDLE hContact) { diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 83f93dff2e..4276df71dc 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -1,7 +1,5 @@ -#include "skype_proto.h" +#include "skype.h" #include "skype_chat.h" -#include -#include enum CHAT_LIST_MENU { diff --git a/protocols/Skype/src/skype_contacts.cpp b/protocols/Skype/src/skype_contacts.cpp index 9b5f1e0cd2..37c97d286e 100644 --- a/protocols/Skype/src/skype_contacts.cpp +++ b/protocols/Skype/src/skype_contacts.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" void CSkypeProto::UpdateContactAuthState(HANDLE hContact, CContact::Ref contact) { diff --git a/protocols/Skype/src/skype_database.cpp b/protocols/Skype/src/skype_database.cpp index 2ee7a22eca..f67bad9f86 100644 --- a/protocols/Skype/src/skype_database.cpp +++ b/protocols/Skype/src/skype_database.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" bool CSkypeProto::IsMessageInDB(HANDLE hContact, DWORD timestamp, SEBinary &guid, int flag) { diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index 3f225f7dc2..f4927c049a 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index 9432284352..dd1c7c7684 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" int CSkypeProto::OnModulesLoaded(WPARAM, LPARAM) { diff --git a/protocols/Skype/src/skype_hooks.cpp b/protocols/Skype/src/skype_hooks.cpp index 60592fa39f..5a0d3cfa61 100644 --- a/protocols/Skype/src/skype_hooks.cpp +++ b/protocols/Skype/src/skype_hooks.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" void CSkypeProto::InitHookList() { diff --git a/protocols/Skype/src/skype_icons.cpp b/protocols/Skype/src/skype_icons.cpp index 25ac88589c..f3bf880b66 100644 --- a/protocols/Skype/src/skype_icons.cpp +++ b/protocols/Skype/src/skype_icons.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" _tag_iconList CSkypeProto::IconList[] = { diff --git a/protocols/Skype/src/skype_instances.cpp b/protocols/Skype/src/skype_instances.cpp index 603a551a03..c3d8adea64 100644 --- a/protocols/Skype/src/skype_instances.cpp +++ b/protocols/Skype/src/skype_instances.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" LIST CSkypeProto::instanceList(1, CSkypeProto::CompareProtos); diff --git a/protocols/Skype/src/skype_menus.cpp b/protocols/Skype/src/skype_menus.cpp index e47754fbb3..41ffc990ac 100644 --- a/protocols/Skype/src/skype_menus.cpp +++ b/protocols/Skype/src/skype_menus.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" HANDLE CSkypeProto::hChooserMenu; HANDLE CSkypeProto::contactMenuItems[CMI_TEMS_COUNT]; diff --git a/protocols/Skype/src/skype_messages.cpp b/protocols/Skype/src/skype_messages.cpp index 3619de3382..b4788e98a5 100644 --- a/protocols/Skype/src/skype_messages.cpp +++ b/protocols/Skype/src/skype_messages.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" int CSkypeProto::OnMessagePreCreate(WPARAM, LPARAM lParam) { diff --git a/protocols/Skype/src/skype_netlib.cpp b/protocols/Skype/src/skype_netlib.cpp index 0095383ffe..8641eb8de8 100644 --- a/protocols/Skype/src/skype_netlib.cpp +++ b/protocols/Skype/src/skype_netlib.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" void CSkypeProto::InitNetLib() { diff --git a/protocols/Skype/src/skype_own_info.cpp b/protocols/Skype/src/skype_own_info.cpp index 302932b369..7682b2722b 100644 --- a/protocols/Skype/src/skype_own_info.cpp +++ b/protocols/Skype/src/skype_own_info.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" void __cdecl CSkypeProto::LoadOwnInfo(void *) { diff --git a/protocols/Skype/src/skype_profile.cpp b/protocols/Skype/src/skype_profile.cpp index 48d3214052..4ab12980c9 100644 --- a/protocols/Skype/src/skype_profile.cpp +++ b/protocols/Skype/src/skype_profile.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" #include void CSkypeProto::UpdateProfileAvatar(SEObject *obj, HANDLE hContact) diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index 3347708837..b0ccba123b 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName) : Skype(1), diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index 4c79e4355f..b19944400b 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -1,21 +1,5 @@ #pragma once -#include "skype.h" -#include "string_list.h" - -#include "skypekit\common.h" -#include "skypekit\group.h" -#include "skypekit\search.h" -#include "skypekit\account.h" -#include "skypekit\contact.h" -#include "skypekit\message.h" -#include "skypekit\transfer.h" -#include "skypekit\participant.h" -#include "skypekit\conversation.h" - -#include -#include - typedef void (__cdecl CSkypeProto::* SkypeThreadFunc) (void*); typedef int (__cdecl CSkypeProto::* SkypeEventFunc)(WPARAM, LPARAM); typedef INT_PTR (__cdecl CSkypeProto::* SkypeServiceFunc)(WPARAM, LPARAM); diff --git a/protocols/Skype/src/skype_runtime.cpp b/protocols/Skype/src/skype_runtime.cpp index b5ebbfef0c..a5c41d58c2 100644 --- a/protocols/Skype/src/skype_runtime.cpp +++ b/protocols/Skype/src/skype_runtime.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" #include "aes\aes.h" diff --git a/protocols/Skype/src/skype_services.cpp b/protocols/Skype/src/skype_services.cpp index 051051a466..b2f50ca917 100644 --- a/protocols/Skype/src/skype_services.cpp +++ b/protocols/Skype/src/skype_services.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" void CSkypeProto::InitServiceList() { diff --git a/protocols/Skype/src/skype_skype.cpp b/protocols/Skype/src/skype_skype.cpp index 214f4fb242..65df7f98f7 100644 --- a/protocols/Skype/src/skype_skype.cpp +++ b/protocols/Skype/src/skype_skype.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" CAccount* CSkypeProto::newAccount(int oid) { diff --git a/protocols/Skype/src/skype_transfers.cpp b/protocols/Skype/src/skype_transfers.cpp index 0b2a4286fa..6cd70b09d8 100644 --- a/protocols/Skype/src/skype_transfers.cpp +++ b/protocols/Skype/src/skype_transfers.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" void CSkypeProto::OnTransferChanged(CTransfer::Ref transfer, int prop) { diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp index 9af8c5b5cf..f61b2b8afe 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/protocols/Skype/src/skype_utils.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h" +#include "skype.h" wchar_t *CSkypeProto::ValidationReasons[] = { diff --git a/protocols/Skype/src/stdafx.cpp b/protocols/Skype/src/stdafx.cpp new file mode 100644 index 0000000000..102b3be23c --- /dev/null +++ b/protocols/Skype/src/stdafx.cpp @@ -0,0 +1 @@ +#include "skype.h" -- cgit v1.2.3