diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-07-31 20:18:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-31 20:18:57 -0400 |
| commit | c81632dd166d655ddb43e12cc0bac00ecc1446e4 (patch) | |
| tree | 143c0f7aa970b12ba303d37cd2415570fd7ebebe | |
| parent | 174bcc443435100da31b20db5ab684f4f3c8255b (diff) | |
| parent | 224fc8bea534b18562d0c5c957fedb3d0284958f (diff) | |
| download | servo-c81632dd166d655ddb43e12cc0bac00ecc1446e4.tar.gz servo-c81632dd166d655ddb43e12cc0bac00ecc1446e4.zip | |
Auto merge of #23901 - paulrouget:fixx64, r=jdm
Missing libraries for HoloLens x64
r? @jdm
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23901)
<!-- Reviewable:end -->
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 9635d612a8d..096a0a2510e 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -211,7 +211,9 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</DeploymentContent> </None> - <None Include="..\..\..\target\debug\msvcp140.dll" /> + <None Include="..\..\..\target\debug\msvcp140.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> + </None> <None Include="..\..\..\target\debug\simpleservo.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild> @@ -226,7 +228,9 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</DeploymentContent> </None> - <None Include="..\..\..\target\debug\vcruntime140.dll" /> + <None Include="..\..\..\target\debug\vcruntime140.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> + </None> <None Include="..\..\..\target\release\api-ms-win-crt-runtime-l1-1-0.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> </DeploymentContent> |