Tox: Release64 compilation fix, 2010 projects updated

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

3 files changed, 63 insertions, 27 deletions

diff --git a/protocols/Tox/Tox_10.vcxproj b/protocols/Tox/Tox_10.vcxproj
index f8132e344a..9d962f7a2c 100644
--- a/protocols/Tox/Tox_10.vcxproj
+++ b/protocols/Tox/Tox_10.vcxproj
@@ -78,7 +78,7 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>tox\include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <StringPooling>false</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

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

@@ -89,17 +89,17 @@
     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalLibraryDirectories>tox\lib\x86;$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;libtox.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <PostBuildEvent>

-      <Command>xcopy tox\dll\x86\*.dll "$(SolutionDir)$(Configuration)" /Y</Command>

+      <Command>copy bin\$(PlatformShortName)\libtox.dll "$(SolutionDir)$(Configuration)\libtox.dll" /y</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -107,20 +107,20 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>tox\include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <StringPooling>false</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

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

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalLibraryDirectories>tox\lib\x64;$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <AdditionalDependencies>dnsapi.lib;libtox-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <PostBuildEvent>

-      <Command>xcopy tox\dll\x64\*.dll "$(SolutionDir)$(Configuration)64" /Y</Command>

+      <Command>copy bin\$(PlatformName)\libtox.dll "$(SolutionDir)$(Configuration)\libtox.dll" /y</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -138,10 +138,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>tox\include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

-      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -149,9 +149,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalLibraryDirectories>tox\lib\x86;$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <AdditionalDependencies>dnsapi.lib;libtox.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

     <ResourceCompile>

@@ -159,7 +159,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <PostBuildEvent>

-      <Command>xcopy tox\dll\x86\*.dll "$(SolutionDir)$(Configuration)" /Y</Command>

+      <Command>copy bin\$(PlatformShortName)\libtox.dll "$(SolutionDir)$(Configuration)\libtox.dll" /y</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -169,10 +169,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>tox\include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

-      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -180,8 +180,8 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalDependencies>dnsapi.lib;libtox-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>tox\lib\x64;$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

@@ -190,7 +190,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <PostBuildEvent>

-      <Command>xcopy tox\dll\x64\*.dll "$(SolutionDir)$(Configuration)64" /Y</Command>

+      <Command>copy bin\$(PlatformName)\libtox.dll "$(SolutionDir)$(Configuration)\libtox.dll" /y</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -202,6 +202,13 @@
     <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

     <ClCompile Include="src\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/protocols/Tox/Tox_10.vcxproj.filters b/protocols/Tox/Tox_10.vcxproj.filters
index 108ad43843..bcfaa958c1 100644
--- a/protocols/Tox/Tox_10.vcxproj.filters
+++ b/protocols/Tox/Tox_10.vcxproj.filters
@@ -10,6 +10,9 @@
     <Filter Include="Resource Files">

       <UniqueIdentifier>{b818611d-200d-4eb8-be7a-f15b396ae26d}</UniqueIdentifier>

     </Filter>

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

+      <UniqueIdentifier>{87c3094c-c0d1-4179-856d-55d02a4450cc}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

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

@@ -44,31 +47,31 @@
     <ClCompile Include="src\tox_contacts.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\tox_netlib.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\tox_search.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\stdafx.cpp">

@@ -77,6 +80,27 @@
     <ClCompile Include="src\tox_avatars.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

+    </ClCompile>

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

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

+    </ClCompile>

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

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

+    </ClCompile>

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

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

+    </ClCompile>

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

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

+    </ClCompile>

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

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

+    </ClCompile>

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

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

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -86,4 +110,9 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

+  <ItemGroup>

+    <Image Include="res\tox.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Tox/Tox_12.vcxproj b/protocols/Tox/Tox_12.vcxproj
index 893326bd6e..76ca28c1f2 100644
--- a/protocols/Tox/Tox_12.vcxproj
+++ b/protocols/Tox/Tox_12.vcxproj
@@ -184,7 +184,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalDependencies>dnsapi.lib;libtox-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

     </Link>