loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to CEF v3.2171.1979.

Browse Source 
Using the bundled VS solution files is deprecated, and they aren't
provided for the 2272 branch, so update the instructions to use
CMake. One D3D DLL has been replaced with a newer DLL too, so
the build and packaging scripts have been updated for that.
This commit is contained in:
Oliver Hamlet
2015-02-01 11:49:22 +00:00
parent 6eb765ff0f
commit eee2bfac7c
4 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -142,7 +142,7 @@ link_directories ("${LIBLOADORDER_ROOT}/build"
"${LIBGIT2_ROOT}/build"
"${YAMLCPP_ROOT}/build"
"${CEF_ROOT}/Release"
"${CEF_ROOT}/out/Release/lib")
"${CEF_ROOT}/build/libcef_dll/Release")
##############################
@@ -267,7 +267,7 @@ add_custom_command(
)
# Copy CEF DLLs.
FOREACH(cef_dll d3dcompiler_46.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)
add_custom_command(TARGET LOOT POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_SOURCE_DIR}/${CEF_ROOT}/$<CONFIGURATION>/${cef_dll}"
docs/BUILD.MSVC.md
+21 -14
View File
@@ -13,19 +13,27 @@ b2 toolset=msvc threadapi=win32 link=static runtime-link=static variant=release
#### Chromium Embedded Framework
Most of the required binaries are pre-built, but the libcef_dll_wrapper dynamic library must be built. Just open its project file and build it with the `Release` configuration.
Most of the required binaries are pre-built, but the libcef_dll_wrapper dynamic library must be built.
1. Configure CMake and generate a build system for Visual Studio by running:
```
mkdir build && cd build
cmake.exe .. -G "Visual Studio 12"
```
2. Open the generated solution file, and build it with `Release` configuration.
#### yaml-cpp
1. Configure CMake and generate a build system for Visual Studio by running:
2.
```
mkdir build
cd build
cmake.exe .. -G "Visual Studio 12" -DBOOST_ROOT={BOOST_ROOT} -DMSVC_SHARED_RT=OFF
```
Adapt the commands as necessary for your particular setup.
```
mkdir build && cd build
cmake.exe .. -G "Visual Studio 12" -DBOOST_ROOT={BOOST_ROOT} -DMSVC_SHARED_RT=OFF
```
Adapt the commands as necessary for your particular setup.
2. Open the generated solution file, and build it with `Release` configuration.
#### Libloadorder
@@ -37,12 +45,11 @@ Example CMake keys: `-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=build -DCMAKE_ARCHIVE_OUTP
#### Libgit2
1. Configure CMake and generate a build system for Visual Studio by running:
2.
```
mkdir build
cd build
cmake.exe .. -G "Visual Studio 12" -DBUILD_SHARED_LIBS=OFF -DSTATIC_CRT=ON -DTHREADSAFE=ON
```
```
mkdir build && cd build
cmake.exe .. -G "Visual Studio 12" -DBUILD_SHARED_LIBS=OFF -DSTATIC_CRT=ON -DTHREADSAFE=ON
```
Adapt the commands as necessary for your particular setup.
2. Open the generated solution file, and build it with `Release` configuration.
src/archive.py
+1 -1
View File
@@ -113,7 +113,7 @@ def createAppArchive(archive_path):
# Now copy everything into the temporary folder.
# LOOT executable and CEF files.
shutil.copy( os.path.join('..', 'build', 'Release', 'LOOT.exe'), temp_path )
shutil.copy( os.path.join('..', 'build', 'Release', 'd3dcompiler_46.dll'), temp_path )
shutil.copy( os.path.join('..', 'build', 'Release', 'd3dcompiler_47.dll'), temp_path )
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 )
src/installer.nsi
+2 -2
View File
@@ -324,7 +324,7 @@ FunctionEnd
;Install executable.
SetOutPath "$INSTDIR"
File "..\build\Release\LOOT.exe"
File "..\build\Release\d3dcompiler_46.dll"
File "..\build\Release\d3dcompiler_47.dll"
File "..\build\Release\libEGL.dll"
File "..\build\Release\libGLESv2.dll"
File "..\build\Release\libcef.dll"
@@ -481,7 +481,7 @@ FunctionEnd
;Remove main executables.
Delete "$INSTDIR\LOOT.exe"
Delete "$INSTDIR\d3dcompiler_46.dll"
Delete "$INSTDIR\d3dcompiler_47.dll"
Delete "$INSTDIR\libEGL.dll"
Delete "$INSTDIR\libGLESv2.dll"
Delete "$INSTDIR\libcef.dll"