Skip to content

Commit e1ded53

Browse files
Synchronize changes from 1.6 master branch [ci skip]
e4bea3b Remove cppdialect for glob and lunasvg 92c1947 Fix typo in gen_language_list build-solution.bat 559081d Update client en_US pot
2 parents 7448da0 + e4bea3b commit e1ded53

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

utils/src/gen_language_list/build-solution.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ exit /b 1
2121
:SetupEnv
2222
echo Found Visual Studio environment setup batch file:
2323
echo ^>^> %VSDEVCMD%
24-
call "%VSDEVCMD%" -arch=arm64 -host_arch=amd64 >NUL
24+
call "%VSDEVCMD%" -arch=amd64 -host_arch=amd64 >NUL
2525

2626
where MSBuild.exe >NUL 2>&1
2727
if %ERRORLEVEL% == 0 goto :Build

utils/src/gen_language_list/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ workspace "utility"
33
architecture "x86_64"
44
preferredtoolarchitecture "x86_64"
55
staticruntime "on"
6-
cppdialect "C++20"
6+
cppdialect "C++23"
77
characterset "Unicode"
88
flags "MultiProcessorCompile"
99
warnings "Off"

vendor/glob/premake5.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
project "glob"
22
language "C++"
3-
cppdialect "C++17"
43
kind "StaticLib"
54
targetname "glob"
65

vendor/lunasvg/premake5.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
project "lunasvg"
22
language "C++"
3-
cppdialect "C++17"
43
kind "StaticLib"
54
targetname "lunasvg"
65
targetdir(buildpath("mta"))

0 commit comments

Comments
 (0)