summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props14
1 files changed, 2 insertions, 12 deletions
diff --git a/dir.props b/dir.props
index 1b3329f8e1..ad66a0b8fa 100644
--- a/dir.props
+++ b/dir.props
@@ -2,6 +2,8 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Condition="Exists('..\dir.props')" Project="..\dir.props" />
+ <Import Project="dir.common.props" />
+
<!--
$(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
-->
@@ -42,18 +44,6 @@
<!-- Common properties -->
<PropertyGroup>
- <!-- Set basic properties and normalize -->
- <BuildArch>$(__BuildArch)</BuildArch>
- <BuildArch Condition="'$(__BuildArch)'==''">x64</BuildArch>
- <BuildArch Condition="'$(__BuildArch)' == 'amd64'">x64</BuildArch>
-
- <BuildType Condition="'$(__BuildType)'==''">Debug</BuildType>
- <BuildType Condition="'$(__BuildType)' == 'debug'">Debug</BuildType>
- <BuildType Condition="'$(__BuildType)' == 'release'">Release</BuildType>
- <BuildType Condition="'$(__BuildType)' == 'checked'">Checked</BuildType>
-
- <BuildOS>$(__BuildOS)</BuildOS>
- <BuildOS Condition="'$(__BuildOS)' == ''">Windows_NT</BuildOS>
<ProjectDir>$(__ProjectDir)\</ProjectDir>
<ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</ProjectDir>