summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-11-12 22:08:45 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-11-12 22:08:45 +0000
commite57b5d0b283056340c0cc1a719b3defaca446039 (patch)
tree3c207a9d2ecc6bacbf93b36d88421564bf60de1f
parent88b7a78697b90aa6d67c6d942bb25872c4ce3c59 (diff)
libs are created in temporary folder
git-svn-id: http://svn.miranda-ng.org/main/trunk@6883 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/FTPFileYM/curl/lib/vc6libcurl_10.vcxproj13
-rw-r--r--plugins/FTPFileYM/curl/lib/vc6libcurl_11.vcxproj12
-rw-r--r--plugins/FTPFileYM/curl/lib/vc6libcurl_12.vcxproj12
-rw-r--r--plugins/FTPFileYM/ftpfile_10.vcxproj8
-rw-r--r--plugins/FTPFileYM/ftpfile_11.vcxproj12
-rw-r--r--plugins/FTPFileYM/ftpfile_12.vcxproj8
6 files changed, 27 insertions, 38 deletions
diff --git a/plugins/FTPFileYM/curl/lib/vc6libcurl_10.vcxproj b/plugins/FTPFileYM/curl/lib/vc6libcurl_10.vcxproj
index b72e10649e..c811452f62 100644
--- a/plugins/FTPFileYM/curl/lib/vc6libcurl_10.vcxproj
+++ b/plugins/FTPFileYM/curl/lib/vc6libcurl_10.vcxproj
@@ -56,23 +56,20 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <TargetName>$(ProjectName)d32</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <TargetName>$(ProjectName)d64</TargetName>
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <TargetName>$(ProjectName)32</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <TargetName>$(ProjectName)64</TargetName>
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/plugins/FTPFileYM/curl/lib/vc6libcurl_11.vcxproj b/plugins/FTPFileYM/curl/lib/vc6libcurl_11.vcxproj
index e4aa8eac19..0c383ee171 100644
--- a/plugins/FTPFileYM/curl/lib/vc6libcurl_11.vcxproj
+++ b/plugins/FTPFileYM/curl/lib/vc6libcurl_11.vcxproj
@@ -60,23 +60,19 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <TargetName>$(ProjectName)d32</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <TargetName>$(ProjectName)d64</TargetName>
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <TargetName>$(ProjectName)32</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <TargetName>$(ProjectName)64</TargetName>
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/plugins/FTPFileYM/curl/lib/vc6libcurl_12.vcxproj b/plugins/FTPFileYM/curl/lib/vc6libcurl_12.vcxproj
index 6fd48fd650..04c79d2eb7 100644
--- a/plugins/FTPFileYM/curl/lib/vc6libcurl_12.vcxproj
+++ b/plugins/FTPFileYM/curl/lib/vc6libcurl_12.vcxproj
@@ -60,23 +60,19 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <TargetName>$(ProjectName)d32</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <TargetName>$(ProjectName)d64</TargetName>
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <TargetName>$(ProjectName)32</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <TargetName>$(ProjectName)64</TargetName>
- <OutDir>$(SolutionDir)\lib\</OutDir>
+ <OutDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/plugins/FTPFileYM/ftpfile_10.vcxproj b/plugins/FTPFileYM/ftpfile_10.vcxproj
index e38f8095af..8f041e8bee 100644
--- a/plugins/FTPFileYM/ftpfile_10.vcxproj
+++ b/plugins/FTPFileYM/ftpfile_10.vcxproj
@@ -82,7 +82,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -110,7 +110,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurl64.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -139,7 +139,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurld32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -164,7 +164,7 @@
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurld64.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
diff --git a/plugins/FTPFileYM/ftpfile_11.vcxproj b/plugins/FTPFileYM/ftpfile_11.vcxproj
index d30e382f2d..ad58b80649 100644
--- a/plugins/FTPFileYM/ftpfile_11.vcxproj
+++ b/plugins/FTPFileYM/ftpfile_11.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -86,7 +86,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -113,7 +113,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurl64.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -141,7 +141,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurld32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -167,7 +167,7 @@
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurld64.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -222,7 +222,7 @@
<ProjectReference Include="..\Zlib\zlib_11.vcxproj">
<Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
</ProjectReference>
- <ProjectReference Include="curl\lib\vc6libcurl_11.vcxproj">
+ <ProjectReference Include="curl\lib\vc6libcurl_12.vcxproj">
<Project>{01f9e227-06f5-4bed-907f-402ca7dfafe6}</Project>
</ProjectReference>
</ItemGroup>
diff --git a/plugins/FTPFileYM/ftpfile_12.vcxproj b/plugins/FTPFileYM/ftpfile_12.vcxproj
index 22212ad1a5..cf9a37088a 100644
--- a/plugins/FTPFileYM/ftpfile_12.vcxproj
+++ b/plugins/FTPFileYM/ftpfile_12.vcxproj
@@ -86,7 +86,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -113,7 +113,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurl64.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -141,7 +141,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurld32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -167,7 +167,7 @@
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;libcurld64.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>