Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move CEF resources path #3717

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Move CEF resources path #3717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Client/cefweb/CWebCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ bool CWebCore::Initialise()
#else
CefString(&settings.browser_subprocess_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\CEFLauncher_d.exe")));
#endif
CefString(&settings.resources_dir_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF")));
CefString(&settings.cache_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cache")));
CefString(&settings.locales_dir_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\locales")));
CefString(&settings.log_file).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cefdebug.txt")));
Expand Down
6 changes: 3 additions & 3 deletions utils/buildactions/install_cef.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ premake.modules.install_cef = {}
local CEF_PATH = "vendor/cef3/cef/"
local CEF_TEMP_PATH = "vendor/cef3/"
local CEF_URL_PREFIX = "https://cef-builds.spotifycdn.com/cef_binary_"
local CEF_URL_SUFFIX = "_windows32_beta_minimal.tar.bz2"
local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"

-- Change here to update CEF version
local CEF_VERSION = "129.0.4+g9774348+chromium-129.0.6668.29"
local CEF_HASH = "70b021ac8921de30c31241d85be8ad5abc65adec4283aff726600319f27034b1"
local CEF_VERSION = "128.4.8+g88b5034+chromium-128.0.6613.114"
tederis marked this conversation as resolved.
Show resolved Hide resolved
local CEF_HASH = "eb5a84db83b51f6d6be43e9bb7f8a557e86dd056a9a565251c28c301feb1c9ef"

function make_cef_download_url()
return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX
Expand Down
2 changes: 1 addition & 1 deletion vendor/cef3/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ project "CEF"
postbuildcommands {
"{COPY} \""..cef_path.."Release/*\" \""..path.."mta\"",
"{COPY} \""..cef_path.."Resources/icudtl.dat\" \""..path.."mta\"",
"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta/cef\"",
"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta\"",
"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta/cef/locales\""
}

Expand Down
Loading