Fix building and packaging 64-bit LOOT

No installer support, as that requires a bit more thought, especially
regarding Registry keys.
This commit is contained in:
Oliver Hamlet
2015-12-01 18:06:38 +00:00
parent 7f57c3dc49
commit dc9fdb1b5e
2 changed files with 12 additions and 2 deletions
+8 -1
View File
@@ -357,12 +357,19 @@ IF (CMAKE_SYSTEM_NAME MATCHES "Windows")
)
# Copy CEF binaries.
FOREACH(cef_dll libcef.dll natives_blob.bin snapshot_blob.bin d3dcompiler_47.dll libEGL.dll libGLESv2.dll wow_helper.exe)
FOREACH(cef_dll libcef.dll natives_blob.bin snapshot_blob.bin d3dcompiler_47.dll libEGL.dll libGLESv2.dll)
add_custom_command(TARGET LOOT POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_SOURCE_DIR}/${CEF_ROOT}/$<CONFIGURATION>/${cef_dll}"
$<TARGET_FILE_DIR:LOOT>/${cef_dll})
ENDFOREACH()
IF (PROJECT_ARCH MATCHES "32")
add_custom_command(TARGET LOOT POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_SOURCE_DIR}/${CEF_ROOT}/$<CONFIGURATION>/wow_helper.exe"
$<TARGET_FILE_DIR:LOOT>/wow_helper.exe)
ENDIF ()
ELSE ()
# Copy CEF binaries.
FOREACH(cef_dll libcef.so natives_blob.bin snapshot_blob.bin chrome-sandbox)
+4 -1
View File
@@ -58,7 +58,6 @@ function createAppArchive(release_path, dest_path) {
'libEGL.dll',
'libGLESv2.dll',
'libcef.dll',
'wow_helper.exe',
'natives_blob.bin',
'snapshot_blob.bin',
'cef.pak',
@@ -67,6 +66,10 @@ function createAppArchive(release_path, dest_path) {
'devtools_resources.pak',
'icudtl.dat'
];
if (helpers.fileExists(path.join(release_path, 'wow_helper.exe'))) {
binaries.push('wow_helper.exe');
}
} else {
binaries = [
'LOOT',