Skip to content

Commit 609c14c

Browse files
committed
external_deps: rework the virtual platforms
1 parent 935a188 commit 609c14c

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

external_deps/build.sh

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,9 +1454,10 @@ all_linux_arm64_default_packages='zlib gmp nettle curl sdl3 glew png jpeg webp o
14541454
base_linux_armhf_default_packages="${base_linux_arm64_default_packages}"
14551455
all_linux_armhf_default_packages="${all_linux_arm64_default_packages}"
14561456

1457-
linux_build_platforms='linux-amd64-default linux-arm64-default linux-armhf-default linux-i686-default windows-amd64-mingw windows-amd64-msvc windows-i686-mingw windows-i686-msvc'
1458-
macos_build_platforms='macos-amd64-default'
1459-
all_platforms="$(echo ${linux_build_platforms} ${macos_build_platforms} | tr ' ' '\n' | sort -u | xargs echo)"
1457+
all_linux_platforms='linux-amd64-default linux-arm64-default linux-armhf-default linux-i686-default'
1458+
all_windows_platforms='windows-amd64-mingw windows-amd64-msvc windows-i686-mingw windows-i686-msvc'
1459+
all_macos_platforms='macos-amd64-default'
1460+
all_platforms="${all_linux_platforms} ${all_windows_platforms} ${all_macos_platforms}"
14601461

14611462
errorHelp() {
14621463
sed -e 's/\\t/'$'\t''/g' <<-EOF
@@ -1472,9 +1473,10 @@ errorHelp() {
14721473
\t${all_platforms}
14731474
14741475
Virtual platforms:
1475-
\tall: all platforms
1476-
\tbuild-linux — platforms buildable on linux: ${linux_build_platforms}
1477-
\tbuild-macos — platforms buildable on macos: ${macos_build_platforms}
1476+
\tlinux — ${all_linux_platforms}
1477+
\twindows — ${all_windows_platforms}
1478+
\tmacos — ${all_macos_platforms}
1479+
\tall — linux windows macos
14781480
14791481
Packages:
14801482
\tpkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
@@ -1568,11 +1570,14 @@ case "${platform}" in
15681570
'all')
15691571
platform_list="${all_platforms}"
15701572
;;
1571-
'build-linux')
1572-
platform_list="${linux_build_platforms}"
1573+
'linux')
1574+
platform_list="${all_linux_platforms}"
15731575
;;
1574-
'build-macos')
1575-
platform_list="${macos_build_platforms}"
1576+
'windows')
1577+
platform_list="${all_windows_platforms}"
1578+
;;
1579+
'macos')
1580+
platform_list="${all_macos_platforms}"
15761581
;;
15771582
*)
15781583
for known_platform in ${all_platforms}

0 commit comments

Comments
 (0)