From 6a4a344e0e8d479175cfc73dcc0138061ddb6d39 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Sat, 13 Sep 2014 10:10:08 +0100 Subject: [PATCH] Bundle wow_helper.exe Should fix #275. --- CMakeLists.txt | 2 +- src/archive.py | 1 + src/installer.nsi | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a0756374..5a4475e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,7 +171,7 @@ add_executable (LOOT ${LOOT_GUI_SRC}) target_link_libraries (LOOT ${Boost_LIBRARIES} ${LOOT_GUI_LIBS}) # Copy CEF DLLs. -FOREACH(cef_dll d3dcompiler_43.dll d3dcompiler_46.dll libEGL.dll libGLESv2.dll libcef.dll) +FOREACH(cef_dll d3dcompiler_43.dll d3dcompiler_46.dll libEGL.dll libGLESv2.dll libcef.dll wow_helper.exe) add_custom_command(TARGET LOOT POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/${CEF_ROOT}/$/${cef_dll}" diff --git a/src/archive.py b/src/archive.py index 02c2269f..354eca80 100644 --- a/src/archive.py +++ b/src/archive.py @@ -97,6 +97,7 @@ shutil.copy( os.path.join('..', 'build', 'Release', 'd3dcompiler_46.dll'), temp_ shutil.copy( os.path.join('..', 'build', 'Release', 'libEGL.dll'), temp_path ) shutil.copy( os.path.join('..', 'build', 'Release', 'libGLESv2.dll'), temp_path ) shutil.copy( os.path.join('..', 'build', 'Release', 'libcef.dll'), temp_path ) +shutil.copy( os.path.join('..', 'build', 'Release', 'wow_helper.exe'), temp_path ) shutil.copy( os.path.join('..', 'build', 'Release', 'cef.pak'), temp_path ) shutil.copy( os.path.join('..', 'build', 'Release', 'cef_100_percent.pak'), temp_path ) shutil.copy( os.path.join('..', 'build', 'Release', 'cef_200_percent.pak'), temp_path ) diff --git a/src/installer.nsi b/src/installer.nsi index 8de33ecf..dd6e516e 100644 --- a/src/installer.nsi +++ b/src/installer.nsi @@ -297,6 +297,7 @@ FunctionEnd File "..\build\Release\libEGL.dll" File "..\build\Release\libGLESv2.dll" File "..\build\Release\libcef.dll" + File "..\build\Release\wow_helper.exe" File "..\build\Release\cef.pak" File "..\build\Release\cef_100_percent.pak" File "..\build\Release\cef_200_percent.pak" @@ -438,6 +439,7 @@ FunctionEnd Delete "$INSTDIR\libEGL.dll" Delete "$INSTDIR\libGLESv2.dll" Delete "$INSTDIR\libcef.dll" + Delete "$INSTDIR\wow_helper.exe" Delete "$INSTDIR\cef.pak" Delete "$INSTDIR\cef_100_percent.pak" Delete "$INSTDIR\cef_200_percent.pak"