Remove use of CEF sandbox

The sandbox library file is distributed prebuilt using MSVC 2013, which
means it can't be linked from MSVC 2015, which is in turn needed for
libloadorder's incoming thread safety support, as MSVC 2013 doesn't
support the thread_local keyword.

Removal of the sandbox shouldn't be an issue, as no external
resources/HTTP requests/etc. are used.
This commit is contained in:
Oliver Hamlet
2015-12-06 13:17:02 +00:00
parent aac55832e9
commit f46f9f96e0
2 changed files with 1 additions and 6 deletions
-1
View File
@@ -287,7 +287,6 @@ ELSEIF (MSVC)
crypt32
Rpcrt4)
set (LOOT_GUI_LIBS ${LOOT_LIBS}
cef_sandbox
libcef
libcef_dll_wrapper
rpcrt4
+1 -5
View File
@@ -99,10 +99,6 @@ int main(int argc, char* argv[]) {
// Enable High-DPI support on Windows 7 or newer.
CefEnableHighDPISupport();
// Set up CEF sandbox.
CefScopedSandboxInfo scoped_sandbox;
sandbox_info = scoped_sandbox.sandbox_info();
// Read command line arguments.
CefMainArgs main_args(hInstance);
#else
@@ -114,7 +110,7 @@ int main(int argc, char* argv[]) {
CefRefPtr<loot::LootApp> app(new loot::LootApp);
// Run the process.
int exit_code = CefExecuteProcess(main_args, app.get(), sandbox_info);
int exit_code = CefExecuteProcess(main_args, app.get(), nullptr);
if (exit_code >= 0) {
// The sub-process has completed so return here.
return exit_code;