project fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@4519 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 126 insertions, 22 deletions

diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj
index 74862af1a0..733c9894d8 100644
--- a/protocols/Skype/Skype_11.vcxproj
+++ b/protocols/Skype/Skype_11.vcxproj
@@ -87,6 +87,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <ObjectFileName>$(IntDir)\%(RelativeDir)\</ObjectFileName>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -114,6 +115,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <ObjectFileName>$(IntDir)\%(RelativeDir)\</ObjectFileName>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -140,6 +142,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SKYPE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\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)</AdditionalIncludeDirectories>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <ObjectFileName>$(IntDir)\%(RelativeDir)\</ObjectFileName>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -166,6 +169,7 @@
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;SKYPE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\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)</AdditionalIncludeDirectories>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <ObjectFileName>$(IntDir)\%(RelativeDir)\</ObjectFileName>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -187,14 +191,33 @@
     <ClInclude Include="src\aes\aes.h" />

     <ClInclude Include="src\base64\base64.h" />

     <ClInclude Include="src\skype.h" />

+    <ClInclude Include="src\skypekit\account.h" />

+    <ClInclude Include="src\skypekit\common.h" />

+    <ClInclude Include="src\skypekit\contact.h" />

+    <ClInclude Include="src\skypekit\conversation.h" />

+    <ClInclude Include="src\skypekit\group.h" />

+    <ClInclude Include="src\skypekit\message.h" />

+    <ClInclude Include="src\skypekit\participant.h" />

+    <ClInclude Include="src\skypekit\search.h" />

+    <ClInclude Include="src\skypekit\skype.h" />

+    <ClInclude Include="src\skypekit\transfer.h" />

     <ClInclude Include="src\skype_proto.h" />

     <ClInclude Include="src\version.h" />

     <ClInclude Include="src\resource.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\aes\aes.c" />

+    <ClCompile Include="src\aes\aes.cpp" />

     <ClCompile Include="src\base64\base64.cpp" />

     <ClCompile Include="src\skype.cpp" />

+    <ClCompile Include="src\skypekit\account.cpp" />

+    <ClCompile Include="src\skypekit\contact.cpp" />

+    <ClCompile Include="src\skypekit\conversation.cpp" />

+    <ClCompile Include="src\skypekit\group.cpp" />

+    <ClCompile Include="src\skypekit\message.cpp" />

+    <ClCompile Include="src\skypekit\participant.cpp" />

+    <ClCompile Include="src\skypekit\search.cpp" />

+    <ClCompile Include="src\skypekit\skype.cpp" />

+    <ClCompile Include="src\skypekit\transfer.cpp" />

     <ClCompile Include="src\skype_account.cpp" />

     <ClCompile Include="src\skype_chat.cpp" />

     <ClCompile Include="src\skype_contacts.cpp" />

@@ -207,7 +230,6 @@
     <ClCompile Include="src\skype_netlib.cpp" />

     <ClCompile Include="src\skype_profile.cpp" />

     <ClCompile Include="src\skype_proto.cpp" />

-    <ClCompile Include="src\skype_runtime.cpp" />

     <ClCompile Include="src\skype_services.cpp" />

     <ClCompile Include="src\skype_settings.cpp" />

     <ClCompile Include="src\skype_utils.cpp" />

@@ -216,6 +238,14 @@
     <ResourceCompile Include="res\Version.rc" />

     <ResourceCompile Include="res\Resource.rc" />

   </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\SkypeKit\keypair.bin" />

+    <None Include="..\..\..\SkypeKit\SDK\bin\windows-x86\windows-x86-skypekit.exe" />

+    <None Include="res\auth_grant.ico" />

+    <None Include="res\auth_request.ico" />

+    <None Include="res\auth_revoke.ico" />

+    <None Include="res\Main.ico" />

+  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters
index ad19d3605d..d7470bc9bb 100644
--- a/protocols/Skype/Skype_11.vcxproj.filters
+++ b/protocols/Skype/Skype_11.vcxproj.filters
@@ -4,23 +4,23 @@
     <Filter Include="Source Files">

       <UniqueIdentifier>{13e9b105-554f-4080-b7de-8adf0f43b9f6}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Resource Filess">

-      <UniqueIdentifier>{901463af-0f59-4125-b874-1662b095d403}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Header Files">

       <UniqueIdentifier>{b14a0070-da9c-49e8-8a47-d93df5eed672}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Source Files\aes">

-      <UniqueIdentifier>{7c2516e2-5857-4de1-aa39-218fe52d0363}</UniqueIdentifier>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{901463af-0f59-4125-b874-1662b095d403}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files\Icons">

+      <UniqueIdentifier>{092ce045-936d-405a-abaf-200a3abba159}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Source Files\base64">

-      <UniqueIdentifier>{12057a87-be97-495a-b259-12818d4676b7}</UniqueIdentifier>

+    <Filter Include="Resource Files\Bin">

+      <UniqueIdentifier>{f1aeb5a2-f105-4b8c-a656-08dbe6dc7b2e}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Header Files\aes">

-      <UniqueIdentifier>{47fb7bb0-5020-4279-9e3d-1b747260f167}</UniqueIdentifier>

+    <Filter Include="Header Files\skypekit">

+      <UniqueIdentifier>{a39a08d1-b79a-47eb-8433-1351f9f01401}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Header Files\base64">

-      <UniqueIdentifier>{dea402cc-aae5-43fb-be3b-18687bc615e2}</UniqueIdentifier>

+    <Filter Include="Source Files\skypekit">

+      <UniqueIdentifier>{171bef99-1ab9-424f-835d-9e47ab62365c}</UniqueIdentifier>

     </Filter>

   </ItemGroup>

   <ItemGroup>

@@ -72,14 +72,38 @@
     <ClCompile Include="src\skype_chat.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\skype_runtime.cpp">

+    <ClCompile Include="src\base64\base64.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\aes\aes.c">

-      <Filter>Source Files\aes</Filter>

+    <ClCompile Include="src\skypekit\account.cpp">

+      <Filter>Source Files\skypekit</Filter>

     </ClCompile>

-    <ClCompile Include="src\base64\base64.cpp">

-      <Filter>Source Files\base64</Filter>

+    <ClCompile Include="src\skypekit\contact.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\skypekit\conversation.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\skypekit\group.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\skypekit\message.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\skypekit\participant.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\skypekit\search.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\skypekit\skype.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\skypekit\transfer.cpp">

+      <Filter>Source Files\skypekit</Filter>

+    </ClCompile>

+    <ClCompile Include="src\aes\aes.cpp">

+      <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

@@ -96,18 +120,68 @@
       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\base64\base64.h">

-      <Filter>Header Files\base64</Filter>

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\account.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\common.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\contact.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\conversation.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\group.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\message.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\participant.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\search.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\skype.h">

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

+    <ClInclude Include="src\skypekit\transfer.h">

+      <Filter>Header Files\skypekit</Filter>

     </ClInclude>

     <ClInclude Include="src\aes\aes.h">

-      <Filter>Header Files\aes</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Resource.rc">

-      <Filter>Resource Filess</Filter>

+      <Filter>Resource Files</Filter>

     </ResourceCompile>

     <ResourceCompile Include="res\Version.rc">

-      <Filter>Resource Filess</Filter>

+      <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

+  <ItemGroup>

+    <None Include="res\auth_grant.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </None>

+    <None Include="res\auth_request.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </None>

+    <None Include="res\auth_revoke.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </None>

+    <None Include="res\Main.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </None>

+    <None Include="..\..\..\SkypeKit\SDK\bin\windows-x86\windows-x86-skypekit.exe">

+      <Filter>Resource Files\Bin</Filter>

+    </None>

+    <None Include="..\..\..\SkypeKit\keypair.bin">

+      <Filter>Resource Files\Bin</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file