From d547e8b10cf23473abe98237f5315cc557a19ea0 Mon Sep 17 00:00:00 2001 From: Uladzislau Nikalayevich Date: Thu, 12 Sep 2024 19:16:28 +0300 Subject: [PATCH] Move CEF resources path --- Client/cefweb/CWebCore.cpp | 1 - utils/buildactions/install_cef.lua | 6 +++--- vendor/cef3/premake5.lua | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Client/cefweb/CWebCore.cpp b/Client/cefweb/CWebCore.cpp index de21171949..fe02e029a3 100644 --- a/Client/cefweb/CWebCore.cpp +++ b/Client/cefweb/CWebCore.cpp @@ -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"))); diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua index d46699fd22..194fcde4e6 100644 --- a/utils/buildactions/install_cef.lua +++ b/utils/buildactions/install_cef.lua @@ -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" +local CEF_HASH = "eb5a84db83b51f6d6be43e9bb7f8a557e86dd056a9a565251c28c301feb1c9ef" function make_cef_download_url() return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX diff --git a/vendor/cef3/premake5.lua b/vendor/cef3/premake5.lua index 9b8dc65702..115d004975 100644 --- a/vendor/cef3/premake5.lua +++ b/vendor/cef3/premake5.lua @@ -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\"" }