Create separate manifest for CompositeCefSubprocess.

andreduvoisin · Mar 21, 2019 · 4c1e9cf · 4c1e9cf
1 parent a03c624
commit 4c1e9cf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ file(GLOB_RECURSE ENGINE_SRC_FILES
 	"${ENGINE_SRC_DIR}/*.manifest")
 file(GLOB_RECURSE CEF_SUBPROCESS_SRC_FILES
 	"${CEF_SUBPROCESS_SRC_DIR}/*.cpp"
-	"${ENGINE_SRC_DIR}/*.manifest")
+	"${UI_SRC_DIR}/*.manifest")
 file(GLOB_RECURSE ASSET_CONVERTER_SRC_FILES
 	"${ASSET_CONVERTER_SRC_DIR}/*.cpp"
 	"${ENGINE_SRC_DIR}/common/Math.cpp"

diff --git a/ui/CompositeCefSubprocess.manifest b/ui/CompositeCefSubprocess.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>
diff --git a/ui/web/package-lock.json b/ui/web/package-lock.json