diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 8aef630db78..584afcdce59 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -85,10 +85,10 @@ webxr-api = {git = "https://github.com/servo/webxr"}
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"}
-[target.'cfg(all(not(target_os = "windows"), any(target_os = "android", target_arch = "x86_64")))'.dependencies.servo-media-gstreamer]
+[target.'cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows"))'.dependencies.servo-media-gstreamer]
git = "https://github.com/servo/media"
-[target.'cfg(any(target_os = "windows", not(any(target_os = "android", target_arch = "x86_64"))))'.dependencies.servo-media-dummy]
+[target.'cfg(not(any(target_os = "android", target_arch = "x86_64", target_os = "windows")))'.dependencies.servo-media-dummy]
git = "https://github.com/servo/media"
[target.'cfg(target_os = "windows")'.dependencies]
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 08b3d2766fc..e2ce15fa39f 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -125,10 +125,7 @@ pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId;
pub use servo_config as config;
pub use servo_url as url;
-#[cfg(all(
- not(target_os = "windows"),
- any(target_os = "android", target_arch = "x86_64",)
-))]
+#[cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows",))]
mod media_platform {
use super::ServoMedia;
use servo_media_gstreamer::GStreamerBackend;
@@ -206,10 +203,7 @@ mod media_platform {
}
}
-#[cfg(not(all(
- not(target_os = "windows"),
- any(target_os = "android", target_arch = "x86_64",)
-)))]
+#[cfg(not(any(target_os = "android", target_arch = "x86_64", target_os = "windows",)))]
mod media_platform {
use super::ServoMedia;
pub fn init() {
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index f856cba7d22..61fb1166996 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -281,6 +281,8 @@ class MachCommands(CommandBase):
print("Can't find Visual Studio 2017 installation at %s." % base_vs_path)
sys.exit(1)
+ env['PKG_CONFIG_ALLOW_CROSS'] = "1"
+
if uwp:
# Don't try and build a desktop port.
libsimpleservo = True
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 327ffdc8868..1f14220c899 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -82,9 +82,10 @@
False
False
Always
- arm64
+ x64
1
OnApplicationRun
+ False
@@ -168,6 +169,153 @@
Designer
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
true
@@ -180,12 +328,177 @@
true
+
+ true
+
+
+ true
+
true
+
+ true
+
+
+ true
+
true
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
true
@@ -198,13 +511,180 @@
true
+
+ true
+
+
+ true
+
true
+
+ true
+
+
+ true
+
true
-
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
true
true
@@ -215,6 +695,12 @@
true
+
+ true
+
+
+ true
+
true
true
@@ -236,9 +722,21 @@
true
false
+
+ true
+
+
+ true
+
true
+
+ true
+
+
+ true
+
@@ -247,6 +745,153 @@
true
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
true
@@ -258,6 +903,12 @@
true
+
+ true
+
+
+ true
+
true
true
@@ -266,11 +917,23 @@
false
+
+ true
+
+
+ true
+
true
+
+ true
+
+
+ true
+
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index f8b362ad376..59c46ee463b 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -145,6 +145,666 @@
DebugARM64ServoDLLs
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ ReleaseServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ DebugARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+
+
+ ReleaseARM64ServoDLLs
+