From f48a1c9ebf8a57d7680f263467501f595192e30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 13 Sep 2017 22:36:15 +0200
Subject: [PATCH 1/2] Buildsystem: Windows cross-compilation on Linux defaults
 to 64-bit

---
 platform/windows/detect.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index a7cca239737..5bd9a78f498 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -226,10 +226,13 @@ def configure(env):
         else:
             env["PROGSUFFIX"] = env["PROGSUFFIX"] + ".exe"  # for linux cross-compilation
 
-        mingw_prefix = ""
-
         if (env["bits"] == "default"):
-            env["bits"] = "64" if "PROGRAMFILES(X86)" in os.environ else "32"
+            if (os.name == "nt"):
+                env["bits"] = "64" if "PROGRAMFILES(X86)" in os.environ else "32"
+            else: # default to 64-bit on Linux
+                env["bits"] = "64"
+
+        mingw_prefix = ""
 
         if (env["bits"] == "32"):
             env.Append(LINKFLAGS=['-static'])

From 99c7421eae9c4e0a0bd003a416b0b786d0e19cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 13 Sep 2017 22:36:39 +0200
Subject: [PATCH 2/2] Travis: Try enabling ccache to speed up builds

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 371c965db4d..602152374a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ dist: trusty
 
 sudo: false
 
+cache: ccache
+
 compiler:
   - gcc
   - clang
@@ -76,7 +78,10 @@ addons:
       - clang-format-3.9
 
 before_script:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install scons; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      brew update; brew install scons ccache;
+      export PATH="/usr/local/opt/ccache/libexec:$PATH";
+    fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$GODOT_TARGET" = "android" ]; then
       brew update; brew install -v android-sdk;
       brew install -v android-ndk | grep -v "inflating:" | grep -v "creating:";
@@ -87,9 +92,5 @@ script:
   - if [ "$STATIC_CHECKS" = "yes" ]; then
       sh ./misc/travis/clang-format.sh;
     else
-      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-        scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes CXX=$CXX openssl=builtin;
-      else
-        scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes bits=64 CXX=$CXX openssl=builtin;
-      fi
+      scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes CXX=$CXX builtin_openssl=yes;
     fi