From: <sv...@op...> - 2025-06-09 06:18:25
|
Author: manx Date: Mon Jun 9 08:18:18 2025 New Revision: 23433 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23433 Log: [Fix] build: Fix Windows 11 Clang builds. Modified: trunk/OpenMPT/build/auto/setup_arguments.cmd Modified: trunk/OpenMPT/build/auto/setup_arguments.cmd ============================================================================== --- trunk/OpenMPT/build/auto/setup_arguments.cmd Sat Jun 7 22:00:50 2025 (r23432) +++ trunk/OpenMPT/build/auto/setup_arguments.cmd Mon Jun 9 08:18:18 2025 (r23433) @@ -33,7 +33,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_VS_WITHTARGET=%MPT_VS_VER%win10 if "%MPT_VS_TARGET%" == "win11" set MPT_VS_WITHTARGET=%MPT_VS_VER%win11 if "%MPT_VS_TARGET%" == "default" set MPT_VS_WITHTARGET=%MPT_VS_VER%win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_VS_WITHTARGET=%MPT_VS_VER%win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_VS_WITHTARGET=%MPT_VS_VER%win11clang if "%MPT_VS_ARCH%" == "Win32" ( @@ -46,7 +46,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "x64" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -58,7 +58,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "ARM" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -70,7 +70,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "ARM64" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -82,7 +82,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "ARM64EC" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -94,7 +94,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET32=winxpansi @@ -106,7 +106,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET32=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET32=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET32=win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET32=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET32=win11clang if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET64=winxpansi if "%MPT_VS_TARGET%" == "winxp" set MPT_BIN_TARGET64=winxp @@ -117,7 +117,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET64=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET64=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET64=win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET64=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET64=win11clang if "%MPT_VS_ARCH%" == "Win32" set MPT_BIN_ARCH_TRK=x86 if "%MPT_VS_ARCH%" == "x64" set MPT_BIN_ARCH_TRK=amd64 @@ -153,7 +153,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_DIST_VARIANT_OS=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_DIST_VARIANT_OS=win11 if "%MPT_VS_TARGET%" == "default" set MPT_DIST_VARIANT_OS=win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_DIST_VARIANT_OS=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_DIST_VARIANT_OS=win11clang set MPT_DIST_VARIANT=%MPT_DIST_VARIANT_OS%-%MPT_DIST_VARIANT_ARCH% @@ -167,7 +167,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_DIST_VARIANT_PREFIX=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_DIST_VARIANT_PREFIX=win11 if "%MPT_VS_TARGET%" == "default" set MPT_DIST_VARIANT_PREFIX= -if "%MPT_VS_TARGET%" == "win10clang" set MPT_DIST_VARIANT_PREFIX=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_DIST_VARIANT_PREFIX=win11clang if "%MPT_VS_ARCH%" == "Win32" set MPT_DIST_VARIANT_SUFFIX=x86 if "%MPT_VS_ARCH%" == "x64" set MPT_DIST_VARIANT_SUFFIX=amd64 |