mirror of
https://github.com/glest/glest-source.git
synced 2025-08-30 11:19:48 +02:00
let's try static curl also for mac OS
This commit is contained in:
@@ -74,7 +74,8 @@ cd ${SCRIPTDIR}
|
||||
if [ "$BUILD_BUNDLE" -eq "1" ] && [ -d "p7zip" ]; then rm -rf "p7zip"; fi
|
||||
if [ -e ".p7zip.zip" ] && [ "$(find ./ -name ".p7zip.zip" -mtime +90)" ]; then rm ".p7zip.zip"; rm -rf "p7zip"; fi
|
||||
if [ ! -e ".p7zip.zip" ]; then
|
||||
curl -L -o .p7zip.zip https://github.com/MegaGlest/megaglest-source/releases/download/3.2.3/p7zip.zip 2>/dev/null
|
||||
curl -L -o .p7zip.zip https://github.com/MegaGlest/megaglest-source/releases/download/3.3.0/p7zip.zip 2>/dev/null
|
||||
# ^sha256: 20ac3b0377054f8196c10e569bd6ec7c6ed06d519fa39e781ee6d27d7887588b
|
||||
if [ -e ".p7zip.zip" ]; then touch -m ".p7zip.zip"; fi
|
||||
fi
|
||||
if [ ! -d "p7zip" ]; then unzip .p7zip.zip >/dev/null; fi
|
||||
@@ -195,9 +196,10 @@ if [ "$MAKE_ONLY" -eq "0" ]; then
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_DEV_OUTPATH=ON $WANT_STATIC_LIBS -DBREAKPAD_ROOT=$BREAKPAD_ROOT"
|
||||
if [ "$BUILD_BUNDLE" -ne "1" ]; then
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=''"
|
||||
if [ "$GCC_FORCED" -ne "1" ] || [ "$USE_XCODE" -eq "1" ]; then
|
||||
if [ "$GCC_FORCED" -ne "1" ] || [ "$USE_XCODE" -eq "1" ]; then :
|
||||
#^ Remove this condition when it V will start working on gcc
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_MEGAGLEST_TESTS=ON"
|
||||
#EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_MEGAGLEST_TESTS=ON"
|
||||
#^ Uncomment when it will start working on clang
|
||||
else
|
||||
rm -f ../megaglest_tests
|
||||
fi
|
||||
|
Reference in New Issue
Block a user