mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
Fix use of pkg-config when building SM on macOS
This commit is contained in:
@@ -183,6 +183,7 @@ if [ $force_rebuild = "true" ]; then
|
||||
rm -rf "$PC_PATH"
|
||||
fi
|
||||
mkdir -p "$PC_PATH"
|
||||
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${PC_PATH}"
|
||||
|
||||
echo "Building third-party dependencies..."
|
||||
# --------------------------------------------------------------
|
||||
|
||||
@@ -128,8 +128,7 @@ rm -Rf "${FOLDER}"
|
||||
fi
|
||||
CONF_OPTS="${CONF_OPTS} --target=$ARCH-apple-darwin"
|
||||
|
||||
# Link to custom-built zlib
|
||||
export PKG_CONFIG_PATH="=${ZLIB_DIR}:${PKG_CONFIG_PATH}"
|
||||
# This needs PKG_CONFIG_PATH to be exported in build-macos-libs.sh
|
||||
CONF_OPTS="${CONF_OPTS} --with-system-zlib"
|
||||
# Specify target versions and SDK
|
||||
if [ "${MIN_OSX_VERSION}" ] && [ "${MIN_OSX_VERSION-_}" ]; then
|
||||
|
||||
Reference in New Issue
Block a user