From 9c92f45c6143cab7426d4b0a9fa36dff72d06cc6 Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Mon, 6 Oct 2014 23:45:34 +0000 Subject: [PATCH] Fixes typo in OS X bundle build script. Changes SDL2 version in build-osx-libs.sh to Hg snapshot SDL-2.0.4-9134, refs #2852 This was SVN commit r15849. --- build/workspaces/build-osx-bundle.sh | 2 +- libraries/osx/build-osx-libs.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/workspaces/build-osx-bundle.sh b/build/workspaces/build-osx-bundle.sh index 97982c7e72..d96da190ab 100755 --- a/build/workspaces/build-osx-bundle.sh +++ b/build/workspaces/build-osx-bundle.sh @@ -91,7 +91,7 @@ if [ "$build_release" = "true" ]; then rm -f binaries/data/config/dev.cfg # Only include translations for a subset of languages . source/tools/dist/remove-incomplete-translations.sh $build_path/binaries/data || die "Error excluding translations" - echo L\"${SVNREV}-release\" > build/svn_revision/svn_revision.txt + echo L\"${SVN_REV}-release\" > build/svn_revision/svn_revision.txt cd build/workspaces fi diff --git a/libraries/osx/build-osx-libs.sh b/libraries/osx/build-osx-libs.sh index 1c09f2213a..6ba6566bb4 100755 --- a/libraries/osx/build-osx-libs.sh +++ b/libraries/osx/build-osx-libs.sh @@ -24,7 +24,7 @@ ZLIB_VERSION="zlib-1.2.8" CURL_VERSION="curl-7.32.0" ICONV_VERSION="libiconv-1.14" XML2_VERSION="libxml2-2.9.1" -SDL2_VERSION="SDL2-2.0.3" +SDL2_VERSION="SDL-2.0.4-9134" BOOST_VERSION="boost_1_52_0" # * wxWidgets 2.9+ is necessary for 64-bit OS X build w/ OpenGL support WXWIDGETS_VERSION="wxWidgets-3.0.1" @@ -268,7 +268,7 @@ echo -e "Building SDL2..." LIB_VERSION="${SDL2_VERSION}" LIB_ARCHIVE="$LIB_VERSION.tar.gz" LIB_DIRECTORY=$LIB_VERSION -LIB_URL="http://www.libsdl.org/release/" +LIB_URL="https://www.libsdl.org/tmp/" mkdir -p sdl2 pushd sdl2 > /dev/null