diff options
| author | George Hazan <ghazan@miranda.im> | 2017-02-16 20:51:24 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-02-16 20:51:32 +0300 |
| commit | 4269a726e3ca96a1676d35600f32c29ae5e120a6 (patch) | |
| tree | 11524955096f38f9d5a0e9721199ce3de9a88a88 /build/vc.common | |
| parent | 50c645c58d949b83176d93a0c4f33f7cb856ed73 (diff) | |
duplicated lib folders no needed anymore
Diffstat (limited to 'build/vc.common')
| -rw-r--r-- | build/vc.common/common.props | 4 | ||||
| -rw-r--r-- | build/vc.common/core.props | 21 |
2 files changed, 12 insertions, 13 deletions
diff --git a/build/vc.common/common.props b/build/vc.common/common.props index 7c127cd3a8..c67c03187e 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -2,9 +2,6 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
- <CommonLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\bin10\lib</CommonLibDir>
- <CommonLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\bin12\lib</CommonLibDir>
- <CommonLibDir Condition="'$(VisualStudioVersion)' == '14.0'">$(ProjectDir)..\..\bin14\lib</CommonLibDir>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>$(ProjectName)</RootNamespace>
@@ -35,7 +32,6 @@ </ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;Wtsapi32.lib;netapi32.lib;pdh.lib;shlwapi.lib;Strmiids.lib;gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(CommonLibDir)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>false</GenerateMapFile>
<SubSystem>Windows</SubSystem>
diff --git a/build/vc.common/core.props b/build/vc.common/core.props index 210495854c..0a0836ea2a 100644 --- a/build/vc.common/core.props +++ b/build/vc.common/core.props @@ -27,22 +27,25 @@ <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>
</PropertyGroup>
- <PropertyGroup Label="UserMacros">
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
- <CommonCoreLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\..\bin10\lib</CommonCoreLibDir>
- <CommonCoreLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\..\bin12\lib</CommonCoreLibDir>
- <CommonCoreLibDir Condition="'$(VisualStudioVersion)' == '14.0'">$(ProjectDir)..\..\..\bin14\lib</CommonCoreLibDir>
- </PropertyGroup>
<Import Project="common.props"/>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\plugins\ExternalAPI;..\..\..\..\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
- <Link>
- <AdditionalLibraryDirectories>$(CommonCoreLibDir)</AdditionalLibraryDirectories>
- </Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
+
+ <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+ <Link>
+ <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\libs\win32;$(ProjectDir)..\..\..\..\boost\stage\lib</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+ <Link>
+ <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\libs\win64;$(ProjectDir)..\..\..\..\boost\stage64\lib</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+
</Project>
|