Remove 32 bit mac binary, builder updates.

We are not going to release 32 bit mac builds anymore, because any mac
sold after 2007 will run a 64 bit binary. And since we are building for
10.7, which requires a 64 bit mac, and will run 64 bit binaries even on
a 32 bit kernel, the 32 bit binary was always pointless.

More on this here:

https://apple.stackexchange.com/questions/99640/how-old-are-macs-that-cannot-run-64-bit-applications/99644#99644

https://apple.stackexchange.com/a/261793/206363

Remove references to 32 bit mac binary from the dev manual.

Builder updates:

- Bump cmake 3.13.0-rc1 -> 3.17.3. This is needed for the new
  FetchContent feature in cmake, which we use for Sparkle (online
  updates for mac.)

- Bump sfml to newer master commit.

- Add pre-build hook for libvpx on mac to set
  -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET in CFLAGS.

- Force C locale in all builder scripts, homebrew bash was erroring due
  to some kind of locale bug with a non-English locale.

- Remove .app in build_project() before building, rebuilds were failing
  due to reinstallation of frameworks (Sparkle.)

Signed-off-by: Rafael Kitover <rkitover@gmail.com>

DEVELOPER-MANUAL.md

@@ -22,7 +22,6 @@
     - [64-bit Windows Binary](#64-bit-windows-binary)
     - [32-bit Windows Binary](#32-bit-windows-binary)
     - [64-bit Mac Binary](#64-bit-mac-binary)
-    - [32-bit Mac Binary](#32-bit-mac-binary)
     - [Final steps](#final-steps)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -678,24 +677,6 @@ Collect the following files from `~/vbam-build-mac-64bit/project`:
 - `visualboyadvance-m-Mac-64bit.zip`
 - `visualboyadvance-m-Mac-64bit.zip.asc`
 
-#### 32-bit Mac Binary
-
-If using Mojave or later, you will need Xcode 9 installed side-by-side with
-your OS Xcode, it should be installed to `/Applications/Xcode9.app`.  You can
-obtain it from Apple developer downloads, or alternative sources which should
-not be difficult to find.
-
-Other requirements are the same as for the 64-bit binary.
-
-```bash
-/usr/local/bin/bash tools/osx/builder -32
-```
-
-Collect the following files from `~/vbam-build-mac-32bit/project`:
-
-- `visualboyadvance-m-Mac-32bit.zip`
-- `visualboyadvance-m-Mac-32bit.zip.asc`
-
 #### Final steps
 
 Go to the github releases tab, and make a release for the tag you pushed
@@ -710,8 +691,6 @@ Upload all files collected during the earlier builds, the complete list is:
 
 - `translations.zip`
 - `translations.zip.asc`
-- `visualboyadvance-m-Mac-32bit.zip`
-- `visualboyadvance-m-Mac-32bit.zip.asc`
 - `visualboyadvance-m-Mac-64bit.zip`
 - `visualboyadvance-m-Mac-64bit.zip.asc`
 - `visualboyadvance-m-Win-32bit.zip`

tools/builder/core.sh

@@ -110,7 +110,7 @@ DISTS=$DISTS'
     zip             https://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz                 bin/zip
     openssl         https://www.openssl.org/source/openssl-1.1.1f.tar.gz                                        lib/libssl.a
     curl            https://curl.haxx.se/download/curl-7.65.3.tar.xz                                            lib/libcurl.a
-    cmake           https://cmake.org/files/v3.13/cmake-3.13.0-rc1.tar.gz                                       bin/cmake
+    cmake           https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz              bin/cmake
     m4              http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz                                                  bin/m4
     autoconf        https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz                                       bin/autoconf
     autoconf-archive http://mirror.team-cymru.org/gnu/autoconf-archive/autoconf-archive-2017.09.28.tar.xz       share/aclocal/ax_check_gl.m4
@@ -181,7 +181,7 @@ DISTS=$DISTS'
     libogg          http://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.xz                                  lib/libogg.a
     libvorbis       https://github.com/xiph/vorbis/archive/v1.3.6.tar.gz                                        lib/libvorbis.a
     harfbuzz        https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.5.tar.bz2                lib/libharfbuzz.a
-    sfml            https://github.com/SFML/SFML/archive/013d053277c980946bc7761a2a088f1cbb788f8c.tar.gz        lib/libsfml-system-s.a
+    sfml            https://github.com/SFML/SFML/archive/0337568846584fffcee38036880f9f48888c8b7c.tar.gz        lib/libsfml-system-s.a
     shared-mime-info http://freedesktop.org/~hadess/shared-mime-info-1.9.tar.xz                                 bin/update-mime-database
     wxwidgets       https://github.com/wxWidgets/wxWidgets/archive/55efc9e60742d0de61e39556084d09f2332b99be.tar.gz lib/libwx_baseu-3.1*.a
     graphite2       https://github.com/silnrsi/graphite/archive/ce0e793f22127d7ba6422d440bd83b58f864ef7e.tar.gz lib/libgraphite2.a
@@ -2652,7 +2652,7 @@ build_project() {
     mkdir -p "$BUILD_ROOT/project"
     cd "$BUILD_ROOT/project"
 
-    rm -f visualboyadvance-m.exe
+    rm -rf visualboyadvance-m.exe visualboyadvance-m.app
 
     lto=ON
 

tools/linux/builder

@@ -2,6 +2,9 @@
 
 set -e
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 export BUILD_ROOT="${BUILD_ROOT:=$HOME/vbam-build-linux}"
 
 . "$(dirname "$0")/../builder/unix.sh"

tools/osx/builder

@@ -2,6 +2,9 @@
 
 set -e
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 ## bash 3 does not work for this code
 #if [ -z "$IN_DASH" ]; then
 #    if command -v dash >/dev/null; then
@@ -122,6 +125,10 @@ table_line_append DIST_CONFIGURE_OVERRIDES wxwidgets  "--with-macosx-version-min
 
 table_line_append DIST_ARGS libmodplug "CC=clang++ CXX=clang++"
 
+table_line_append DIST_PRE_BUILD libvpx " \
+    sed -E -i.bak 's/(-mmacosx-version-min=)[[:digit:].]+/\1'\$MACOSX_DEPLOYMENT_TARGET'/g' build/make/configure.sh; \
+"
+
 table_line_append DIST_CONFIGURE_OVERRIDES ffmpeg "--disable-videotoolbox --extra-ldflags='-framework CoreText'"
 
 builder "$@"

tools/osx/third_party_libs_tool

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 version=1.0
 
 main() {

tools/unix/builder

@@ -2,6 +2,9 @@
 
 set -e
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 export BUILD_ROOT="$HOME/vbam-build-unix"
 
 . "$(dirname "$0")/../builder/core.sh"

tools/win/cygwin-cross-builder

@@ -2,6 +2,9 @@
 
 set -e
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 # turn on real symlinks on cygwin
 if [ "$(uname -o 2>/dev/null || :)" = Cygwin ]; then
     new_cygwin= replaced=

tools/win/linux-cross-builder

@@ -2,6 +2,9 @@
 
 set -e
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 . "${0%/*}/../builder/mingw-cross.sh"
 
 builder "$@"

tools/win/mac-cross-builder

@@ -2,6 +2,9 @@
 
 set -e
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 export TAR=tar
 
 . "${0%/*}/../builder/mingw-cross.sh"

tools/win/msys2-builder

@@ -2,6 +2,9 @@
 
 set -e
 
+LANG=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LC_ALL=C
+export LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
+
 case "$1" in
     -32)
         shift