Browse Source

Local builds of Windows WebView

JoshEngebretson 10 years ago
parent
commit
71451a2171

+ 35 - 1
Build/CMake/Modules/AtomicWebView.cmake

@@ -41,6 +41,8 @@ endif()
 if(OS_WINDOWS)
     set(CEF_BINARY_DIR_RELEASE "${CMAKE_SOURCE_DIR}/Submodules/CEF/Windows/64bit/Release")
     set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/libcef.lib")
+    set(CEF_BINARY_DIR "${CMAKE_SOURCE_DIR}/Submodules/CEF/Windows/64bit/Release")
+    set(CEF_RESOURCE_DIR "${CMAKE_SOURCE_DIR}/Submodules/CEF/Windows/64bit/Resources")
 endif()
 
 #
@@ -84,7 +86,7 @@ macro(SET_CEF_TARGET_OUT_DIR)
   else()
     # ATOMIC: Unix Makefiles not creating Debug/Release?
 
-    if(${CMAKE_GENERATOR} STREQUAL "Xcode")
+    if(${CMAKE_GENERATOR} STREQUAL "Xcode" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
       set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
     else()
       set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
@@ -316,4 +318,36 @@ macro(ADD_WINDOWS_MANIFEST manifest_path target)
     )
 endmacro()
 
+# List of CEF binary files.
+set(CEF_BINARY_FILES
+  d3dcompiler_43.dll
+  d3dcompiler_47.dll
+  libcef.dll
+  libEGL.dll
+  libGLESv2.dll
+  natives_blob.bin
+  snapshot_blob.bin
+  )
+
+# We don't have a 32 bit build right now
+#if(PROJECT_ARCH STREQUAL "x86")
+# Only used on 32-bit platforms.
+#  set(CEF_BINARY_FILES
+#    ${CEF_BINARY_FILES}
+#    wow_helper.exe
+#    )
+#endif()
+
+# List of CEF resource files.
+set(CEF_RESOURCE_FILES
+  cef.pak
+  cef_100_percent.pak
+  cef_200_percent.pak
+  cef_extensions.pak
+  devtools_resources.pak
+  icudtl.dat
+  locales
+  )
+
+
 endif(OS_WINDOWS)

+ 2 - 4
Build/Scripts/BuildWindows.js

@@ -34,10 +34,8 @@ namespace('build', function() {
     jake.exec(cmds, function() {
 
       // Copy the Editor binaries
-      fs.copySync(buildDir + "Source/AtomicEditor/Release/AtomicEditor.exe",
-        host.artifactsRoot + "AtomicEditor/AtomicEditor.exe");
-      fs.copySync(buildDir + "Source/AtomicEditor/Release/D3DCompiler_47.dll",
-        host.artifactsRoot + "AtomicEditor/D3DCompiler_47.dll");
+      fs.copySync(buildDir + "Source/AtomicEditor/Release",
+        host.artifactsRoot + "AtomicEditor");
 
       // We need some resources to run
       fs.copySync(atomicRoot + "Resources/CoreData",

+ 12 - 0
Source/AtomicEditor/CMakeLists.txt

@@ -117,6 +117,18 @@ if(OS_MACOSX)
   endif()
 endif()
 
+if(OS_WINDOWS)
+
+  # Determine the target output directory.
+  SET_CEF_TARGET_OUT_DIR()
+
+  # Copy CEF binary and resource files to the target output directory.
+  # set(CEF_TARGET_OUT_DIR $<TARGET_FILE_DIR:AtomicEditor>)
+  COPY_FILES("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "${CEF_TARGET_OUT_DIR}")
+  COPY_FILES("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "${CEF_TARGET_OUT_DIR}")
+
+endif()
+
 endif()