From d2706967cca0a286b87fdcff3a6784c09d852064 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Fri, 5 Jun 2015 20:12:13 +0100 Subject: [PATCH] Update CEF used to branch 2357. Based on Chromium 43. --- CMakeLists.txt | 2 +- README.md | 2 +- src/archive.py | 2 ++ src/installer.nsi | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3412a1fe..29f73397 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,7 +261,7 @@ add_custom_command( ) # Copy CEF DLLs. -FOREACH(cef_dll d3dcompiler_47.dll libEGL.dll libGLESv2.dll libcef.dll wow_helper.exe) +FOREACH(cef_dll d3dcompiler_47.dll libEGL.dll libGLESv2.dll libcef.dll wow_helper.exe natives_blob.bin snapshot_blob.bin) add_custom_command(TARGET LOOT POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/${CEF_ROOT}/$/${cef_dll}" diff --git a/README.md b/README.md index 9843969c..cf00c37f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ LOOT uses [CMake](http://cmake.org) to generate build files, and requires the fo * [Alphanum](http://www.davekoelle.com/files/alphanum.hpp) * [Boost](http://www.boost.org) v1.58.0 -* [Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) branch 2272 +* [Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) branch 2357 * [Google Test](https://code.google.com/p/googletest/) v1.7: Required to build the LOOT API's tests, but not the API itself or the LOOT application. * [Libespm](http://github.com/WrinklyNinja/libespm) * [Libgit2](http://libgit2.github.com/) v0.22.2 diff --git a/src/archive.py b/src/archive.py index d231e439..43731ead 100644 --- a/src/archive.py +++ b/src/archive.py @@ -143,6 +143,8 @@ def createAppArchive(archive_path): shutil.copy( os.path.join('..', 'build', 'Release', 'cef_200_percent.pak'), temp_path ) shutil.copy( os.path.join('..', 'build', 'Release', 'devtools_resources.pak'), temp_path ) shutil.copy( os.path.join('..', 'build', 'Release', 'icudtl.dat'), temp_path ) + shutil.copy( os.path.join('..', 'build', 'Release', 'natives_blob.bin'), temp_path ) + shutil.copy( os.path.join('..', 'build', 'Release', 'snapshot_blob.bin'), temp_path ) # Translation files. for lang in ['es', 'ru', 'fr', 'zh_CN', 'pl', 'pt_BR', 'fi', 'de', 'da', 'ko']: diff --git a/src/installer.nsi b/src/installer.nsi index 9132313d..92c1d179 100644 --- a/src/installer.nsi +++ b/src/installer.nsi @@ -337,6 +337,8 @@ FunctionEnd File "..\build\Release\cef_200_percent.pak" File "..\build\Release\devtools_resources.pak" File "..\build\Release\icudtl.dat" + File "..\build\Release\natives_blob.bin" + File "..\build\Release\snapshot_blob.bin" ;Install UI files. SetOutPath "$INSTDIR\resources\report" @@ -494,6 +496,8 @@ FunctionEnd Delete "$INSTDIR\cef_200_percent.pak" Delete "$INSTDIR\devtools_resources.pak" Delete "$INSTDIR\icudtl.dat" + Delete "$INSTDIR\natives_blob.bin" + Delete "$INSTDIR\snapshot_blob.bin" ;Remove readme images. RMDir /r "$INSTDIR\docs\images"