Skip to content

Some improvement on the deps building #1875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
illwieckz merged 4 commits into from
Nov 29, 2025
+9 −3
Merged

Some improvement on the deps building #1875

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caa71cf
external_deps: rework the macos-amd64 setup a bit
illwieckz Sep 26, 2025
18c4ea7
external_deps: do not cross-compile pkgconfig
illwieckz Sep 26, 2025
588e09a
external_deps: we don't build SDL with pkg-config anymore
illwieckz Sep 26, 2025
faa49c0
external_deps: do not build OpenAL utils
illwieckz Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions external_deps/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ cmake_build() {
cmake --install build --strip
}

# Build pkg-config, needed for opusfile and SDL3.
# Build pkg-config, needed for opusfile.
# As a host-mode dependency it must be provided by the system when cross-compiling.
build_pkgconfig() {
local dir_name="pkg-config-${PKGCONFIG_VERSION}"
Expand All @@ -262,7 +262,12 @@ build_pkgconfig() {

cd "${dir_name}"

CFLAGS="${CFLAGS} -Wno-error=int-conversion" \
# Reset the environment variables, we don't cross-compile this,
# it is part of the cross-compilation toolchain.
# CXXFLAGS is unused.
CFLAGS='-Wno-error=int-conversion' \
LDFLAGS='' \
HOST='' \
configure_build \
--with-internal-glib
}
Expand Down Expand Up @@ -765,6 +770,7 @@ build_openal() {
cd "${dir_name}"

cmake_build \
-DALSOFT_UTILS=OFF \
"${openal_cmake_args[@]}"
;;
esac
Expand Down Expand Up @@ -1416,7 +1422,7 @@ setup_macos-amd64-default() {
MACOS_ARCH=x86_64
# OpenAL requires 10.14.
export MACOSX_DEPLOYMENT_TARGET=10.14 # works with CMake
common_setup macos x86_64-apple-darwin11
common_setup macos "x86_64-apple-macos${MACOSX_DEPLOYMENT_TARGET}"
}

# Set up environment for 32-bit i686 Linux
Expand Down
Loading