Fix build artifacts leaking between platforms.
This moves the `dependencies` target from `core` to `default`, so that we aren't forced to run `linux-dependencies` for non-linux platforms.
This commit is contained in:
committed by
Oliver Brakmann
parent
2afd8a3a74
commit
817db8dbe0
@@ -45,8 +45,13 @@ fi
|
||||
echo "Building core files"
|
||||
|
||||
pushd "${SRCDIR}" > /dev/null || exit 1
|
||||
make linux-dependencies
|
||||
|
||||
make clean
|
||||
|
||||
# linux-dependencies target will trigger the lua detection script, which we don't want during packaging
|
||||
make cli-dependencies geoip-dependencies
|
||||
sed "s/@LIBLUA51@/liblua5.1.so.0/" thirdparty/Eluant.dll.config.in > Eluant.dll.config
|
||||
|
||||
make core SDK="-sdk:4.5"
|
||||
make version VERSION="${TAG}"
|
||||
make install-engine prefix="usr" DESTDIR="${BUILTDIR}/"
|
||||
|
||||
@@ -71,6 +71,7 @@ modify_plist "{FAQ_URL}" "http://wiki.openra.net/FAQ" "${BUILTDIR}/OpenRA.app/Co
|
||||
echo "Building core files"
|
||||
|
||||
pushd "${SRCDIR}" > /dev/null || exit 1
|
||||
make clean
|
||||
make osx-dependencies
|
||||
make core SDK="-sdk:4.5"
|
||||
make version VERSION="${TAG}"
|
||||
|
||||
@@ -38,6 +38,7 @@ function makelauncher()
|
||||
echo "Building core files"
|
||||
|
||||
pushd "${SRCDIR}" > /dev/null || exit 1
|
||||
make clean
|
||||
make windows-dependencies
|
||||
make core SDK="-sdk:4.5"
|
||||
make version VERSION="${TAG}"
|
||||
|
||||
Reference in New Issue
Block a user