Vantha/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix FMT and NVTT not linking with the correct SDK.

Browse Source 
Tested by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4898
This was SVN commit r27469.
This commit is contained in:
Stan 2023-01-19 21:10:18 +00:00
parent 2b6b129b2e
commit 2943747add
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/osx/build-osx-libs.sh
View File

@ -114,7 +114,7 @@ CXXFLAGS="$CXXFLAGS -arch $ARCH"
LDFLAGS="$LDFLAGS -arch $ARCH"
# CMake doesn't seem to pick up on architecture with CFLAGS only
CMAKE_FLAGS="-DCMAKE_OSX_ARCHITECTURES=$ARCH"
CMAKE_FLAGS="-DCMAKE_OSX_ARCHITECTURES=$ARCH -DCMAKE_OSX_DEPLOYMENT_TARGET=$MIN_OSX_VERSION"
JOBS=${JOBS:="-j2"}
@ -1027,7 +1027,7 @@ then
-DFMT_TEST=False \
-DFMT_DOC=False \
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
"$CMAKE_FLAGS" \
$CMAKE_FLAGS \
&& make fmt ${JOBS} && make install) || die "fmt build failed"
popd
@ -1065,7 +1065,7 @@ then
rm -f .already-built
fi
CXXFLAGS="$CXXFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CMAKE_FLAGS="$CMAKE_FLAGS" JOBS="$JOBS" ./build.sh || die "Error building NVTT"
CXXFLAGS="$CXXFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CMAKE_FLAGS=$CMAKE_FLAGS JOBS="$JOBS" ./build.sh || die "Error building NVTT"
popd > /dev/null