summaryrefslogtreecommitdiff
path: root/clr.props
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-02-10 20:35:12 +0900
committerJiyoung Yun <jy910.yun@samsung.com>2017-02-10 20:35:12 +0900
commit4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch)
treeb48831a898906734f8884d08b6e18f1144ee2b82 /clr.props
parentdb20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff)
downloadcoreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz
coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2
coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'clr.props')
-rw-r--r--clr.props19
1 files changed, 1 insertions, 18 deletions
diff --git a/clr.props b/clr.props
index 7a3b3bd26a..b1d3618609 100644
--- a/clr.props
+++ b/clr.props
@@ -93,7 +93,6 @@
<!-- Note: ClrProduct can be set prior to this file to 'Standalone'. -->
<ClrProduct Condition="(('$(BuildProjectName)' == 'CoreCLR' or '$(BuildProjectName)' == 'CoreSys')) and ('$(ClrProduct)' == '' or '$(CoreTarget)' == 'true')">core_clr</ClrProduct>
- <ClrProduct Condition="('$(BuildProjectName)' == '') and ('$(ClrProduct)' == '')">desktop_clr</ClrProduct>
<ClAdditionalOptions>$(ClAdditionalOptions) /Zm200</ClAdditionalOptions>
<TargetDefines Condition="'$(BuildArchitecture)'=='i386'">$(BuildArchitecture);_X86_</TargetDefines>
@@ -120,7 +119,6 @@
<!-- CLR Feature Settings. We set the default values here, allow leaf projects to override, and then
set the CDefines based on these properties in clr.targets
-->
- <Import Project="$(MSBuildThisFileDirectory)clr.desktop.props" />
<Import Project="$(MSBuildThisFileDirectory)clr.coreclr.props" />
<PropertyGroup Condition="'$(CrossGenCompile)'=='true'">
@@ -128,20 +126,15 @@
<!-- If you add new features to this list make sure that they are not affecting codegen or content of datastructures persisted in NGen image -->
<EnCSupported>false</EnCSupported>
<PerfcountersSupportedBuild>false</PerfcountersSupportedBuild>
- <FeatureAppXBinder>false</FeatureAppXBinder>
- <FeatureCasPolicy>false</FeatureCasPolicy>
<FeatureEventTrace>false</FeatureEventTrace>
<FeatureFusion>false</FeatureFusion>
<FeatureIncludeAllInterfaces>false</FeatureIncludeAllInterfaces>
- <FeatureLoaderOptimization>false</FeatureLoaderOptimization>
<FeatureMdaSupported>false</FeatureMdaSupported>
<FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
- <FeatureMulticoreJIT>false</FeatureMulticoreJIT>
<FeatureRandomizedStringHashing>false</FeatureRandomizedStringHashing>
<FeatureReflectionOnlyLoad>false</FeatureReflectionOnlyLoad>
<FeatureStackProbe>false</FeatureStackProbe>
<FeatureReJIT>false</FeatureReJIT>
- <FeaturePls>false</FeaturePls>
<FeatureVersioningLog>false</FeatureVersioningLog>
<FeatureNativeImageGeneration>true</FeatureNativeImageGeneration>
<FeatureReadyToRunCompiler Condition="'$(FeatureReadyToRun)' == 'true'">true</FeatureReadyToRunCompiler>
@@ -162,14 +155,7 @@
<LinkUseCMT>true</LinkUseCMT>
-->
</PropertyGroup>
-
- <PropertyGroup>
- <MainClrModuleName Condition="'$(FeatureCoreclr)'=='true'">coreclr</MainClrModuleName>
- <MainClrModuleName Condition="'$(FeatureCoreclr)'!='true'">clr</MainClrModuleName>
- <MainDacMouleName Condition="'$(FeatureCoreclr)'=='true'">mscordaccore</MainDacMouleName>
- <MainDacMouleName Condition="'$(FeatureCoreclr)'!='true'">mscordacwks</MainDacMouleName>
- </PropertyGroup>
-
+
<PropertyGroup>
<DebugBuild Condition="'$(NTDEBUG)' == '' or '$(NTDEBUG)'=='ntsdnodbg'">false</DebugBuild>
<DebugBuild Condition="'$(NTDEBUG)' != '' and '$(NTDEBUG)'!='ntsdnodbg'">true</DebugBuild>
@@ -253,12 +239,9 @@
<PogoExePhase>1</PogoExePhase>
<ResgenDefines Condition="'$(FeatureImpersonation)' == '1'">$(ResgenDefines) /define:FEATURE_IMPERSONATION</ResgenDefines>
- <ResgenDefines Condition="'$(FeatureCrypto)' == '1'">$(ResgenDefines) /define:FEATURE_CRYPTO</ResgenDefines>
<ResgenDefines Condition="'$(FeatureIsostore)' == '1'">$(ResgenDefines) /define:FEATURE_ISOSTORE</ResgenDefines>
<ResgenDefines Condition="'$(FeatureMacl)' == '1'">$(ResgenDefines) /define:FEATURE_MACL</ResgenDefines>
- <ResgenDefines Condition="'$(FeatureCasPolicy)' == '1'">$(ResgenDefines) /define:FEATURE_CAS_POLICY</ResgenDefines>
<ResgenDefines Condition="'$(FeatureRemoting)' == '1'">$(ResgenDefines) /define:FEATURE_REMOTING</ResgenDefines>
- <ResgenDefines Condition="'$(FeatureSerialization)' == '1'">$(ResgenDefines) /define:FEATURE_SERIALIZATION</ResgenDefines>
<ResgenDefines Condition="'$(FeatureIdentityReference)' == '1'">$(ResgenDefines) /define:FEATURE_IDENTITY_REFERENCE</ResgenDefines>
<ResgenDefines Condition="'$(FeatureDisplayCultureInfo)' == '1'">$(ResgenDefines) /define:FEATURE_DISPLAY_CULTURE_INFO</ResgenDefines>
<ResgenDefines Condition="'$(FeatureDisplayRegionInfo)' == '1'">$(ResgenDefines) /define:FEATURE_DISPLAY_REGION_INFO</ResgenDefines>