diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-07-27 14:41:44 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-07-27 14:41:44 -0700 |
| commit | 0a13af92ae0dc35d2711ad9c684bf76a19b3bdd1 (patch) | |
| tree | fe8bbba062d51b8b51836291b7db9f73195af61b | |
| parent | 480227becb804cd511c23bbcaf4994b839130fd8 (diff) | |
| parent | 5c30031cf8d8e43176788b0f6486d25a7409b81e (diff) | |
| download | coreclr-0a13af92ae0dc35d2711ad9c684bf76a19b3bdd1.tar.gz coreclr-0a13af92ae0dc35d2711ad9c684bf76a19b3bdd1.tar.bz2 coreclr-0a13af92ae0dc35d2711ad9c684bf76a19b3bdd1.zip | |
Merge pull request #1301 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/dlls/mscoree/mscoree.settings.targets | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dlls/mscoree/mscoree.settings.targets b/src/dlls/mscoree/mscoree.settings.targets index 70262350d4..538f39c1ab 100644 --- a/src/dlls/mscoree/mscoree.settings.targets +++ b/src/dlls/mscoree/mscoree.settings.targets @@ -265,6 +265,10 @@ <CppCompile Include="..\DelayLoad.cpp" /> </ItemGroup> + <ItemGroup Condition="'$(FeatureCoreclr)'=='true'"> + <CppCompile Include="..\unixinterface.cpp" /> + </ItemGroup> + <ItemGroup> <Assemble386 Condition="'$(BuildArchitecture)' == 'i386'" Include="..\i386\handlers.asm" /> </ItemGroup> |