MirOTR project adjustment

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

4 files changed, 16 insertions, 16 deletions

diff --git a/plugins/MirOTR/MirOTR/MirOTR.vcxproj b/plugins/MirOTR/MirOTR/MirOTR.vcxproj
index 8c4c2f4b30..bbff5b2ccf 100644
--- a/plugins/MirOTR/MirOTR/MirOTR.vcxproj
+++ b/plugins/MirOTR/MirOTR/MirOTR.vcxproj
@@ -82,11 +82,11 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>libgcrypt.lib;libotr.lib;EkHtml.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>..\Libs\Debug</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <AdditionalLibraryDirectories>$(IntDir)</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

@@ -106,11 +106,11 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>libgcrypt.lib;libotr.lib;EkHtml.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>..\Libs\Debug64</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <AdditionalLibraryDirectories>$(IntDir)</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

@@ -134,13 +134,13 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>libgcrypt.lib;libotr.lib;EkHtml.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>..\Libs\Release</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <AdditionalLibraryDirectories>$(IntDir)</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

@@ -164,13 +164,13 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>libgcrypt.lib;libotr.lib;EkHtml.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>..\Libs\Release64</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <AdditionalLibraryDirectories>$(IntDir)</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

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

diff --git a/plugins/MirOTR/ekhtml/EkHtml.vcxproj b/plugins/MirOTR/ekhtml/EkHtml.vcxproj
index 1593238037..5b658a2d73 100644
--- a/plugins/MirOTR/ekhtml/EkHtml.vcxproj
+++ b/plugins/MirOTR/ekhtml/EkHtml.vcxproj
@@ -58,12 +58,12 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Libs\Debug</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\Libs\Debug64</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\MirOTR\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\MirOTR\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Libs\Release</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Libs\Release64</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\MirOTR\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\MirOTR\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

   </PropertyGroup>

diff --git a/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj b/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj
index c03da38809..b218a4368d 100644
--- a/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj
+++ b/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj
@@ -59,12 +59,12 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Libs\Release\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Libs\Release64\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\MirOTR\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\MirOTR\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Libs\Debug\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\Libs\Debug64\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\MirOTR\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\MirOTR\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

   </PropertyGroup>

diff --git a/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj b/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj
index 7eba801cd9..a7003384e6 100644
--- a/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj
+++ b/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj
@@ -59,12 +59,12 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Libs\Debug\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\Libs\Debug64\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\MirOTR\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\MirOTR\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Libs\Release\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Libs\Release64\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\MirOTR\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\MirOTR\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

   </PropertyGroup>