Skip to content

Commit a93fe22

Browse files
committed
Fix client build
1 parent 6f153cc commit a93fe22

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Shared/installer/nightly.nsi

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,14 @@ SectionGroup /e "$(INST_SEC_CLIENT)" SECGCLIENT
674674
SetOutPath "$INSTDIR\MTA\CEF"
675675
File "${FILES_ROOT}\mta\CEF\CEFLauncher.exe"
676676
File "${FILES_ROOT}\mta\CEF\CEFLauncher_DLL.dll"
677-
File "${FILES_ROOT}\mta\CEF\cef.pak"
678-
File "${FILES_ROOT}\mta\CEF\cef_100_percent.pak"
679-
File "${FILES_ROOT}\mta\CEF\cef_200_percent.pak"
680-
File "${FILES_ROOT}\mta\CEF\devtools_resources.pak"
677+
678+
# Clarification for the below 4 deprecated files: https://bitbucket.org/chromiumembedded/cef/commits/8424f166ccef
679+
#File "${FILES_ROOT}\mta\CEF\cef.pak"
680+
#File "${FILES_ROOT}\mta\CEF\cef_100_percent.pak"
681+
#File "${FILES_ROOT}\mta\CEF\cef_200_percent.pak"
682+
#File "${FILES_ROOT}\mta\CEF\devtools_resources.pak"
683+
684+
# Below file was included in the deprecation referenced above, but already disabled in MTA beforehand
681685
#File "${FILES_ROOT}\mta\CEF\cef_extensions.pak"
682686

683687
SetOutPath "$INSTDIR\MTA\CEF\locales"

vendor/cef3/premake5.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ project "CEF"
2020
postbuildcommands {
2121
"{COPY} \""..cef_path.."Release/*\" \""..path.."mta\"",
2222
"{COPY} \""..cef_path.."Resources/icudtl.dat\" \""..path.."mta\"",
23+
-- The .pak line below will now only generate chrome_100_percent.pak and chrome_200_percent.pak (see https://bitbucket.org/chromiumembedded/cef/commits/8424f166ccef)
2324
"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta/cef\"",
2425
"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta/cef/locales\""
2526
}

0 commit comments

Comments
 (0)