Test fix for build error

multitheftauto · Sep 15, 2024 · 48239f8 · 48239f8
1 parent 3eca027
commit 48239f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Client/cefweb/CWebCore.cpp b/Client/cefweb/CWebCore.cpp
@@ -72,7 +72,6 @@ bool CWebCore::Initialise()
     CefString(&settings.browser_subprocess_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\CEFLauncher_d.exe")));
 #endif
     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")));
 #ifdef MTA_DEBUG
     settings.log_severity = cef_log_severity_t::LOGSEVERITY_INFO;

diff --git a/Shared/installer/nightly.nsi b/Shared/installer/nightly.nsi
@@ -702,8 +702,9 @@ SectionGroup /e "$(INST_SEC_CLIENT)" SECGCLIENT
 	# Below file was included in the deprecation referenced above, but already disabled in MTA beforehand
         #File "${FILES_ROOT}\mta\CEF\cef_extensions.pak"
 
-        SetOutPath "$INSTDIR\MTA\CEF\locales"
-        File "${FILES_ROOT}\mta\CEF\locales\en-US.pak"
+		# CEF locales
+        SetOutPath "$INSTDIR\MTA\"
+        File "${FILES_ROOT}\mta\en-US.pak"
 
 
         ${If} "$(LANGUAGE_CODE)" != ""

diff --git a/vendor/cef3/premake5.lua b/vendor/cef3/premake5.lua
@@ -21,7 +21,7 @@ project "CEF"
 		"{COPY} \""..cef_path.."Release/*\" \""..path.."mta\"",
 		"{COPY} \""..cef_path.."Resources/icudtl.dat\" \""..path.."mta\"",
 		"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta\"",
-		"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta/cef/locales\""
+		"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta\""
 	}
 
 	filter "architecture:not x86"