From d33e007d0fa6541aa53f6be0f3d3f472ecc2a87f Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 15:03:04 +0000
Subject: [PATCH 01/22] Apparently Travis's 'sudo' is deprecated now?

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1fc0caf4..2951edb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@
 git:
     depth: 5
 
-# No need for sudo
-sudo: false
-
 # Bionic is the most recent version of Ubuntu I can get to work properly
 dist: bionic
 

From d8d08bf553bdfb4e2358a17ba3f3407cda0e5ee6 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 15:21:14 +0000
Subject: [PATCH 02/22] Try to get a Travis native Windows build working

---
 .travis.yml | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2951edb6..33cac740 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,16 @@ language: cpp
 
 # Cache compiled object files with ccache
 cache: ccache
+    directories:
+    - $HOME/AppData/Local/Temp/chocolatey
+    - /C/tools/msys64
 
 compiler:
     - gcc
 
 os:
     - linux
+    - windows
 
 addons:
   apt:
@@ -32,6 +36,25 @@ env:
     - MAKE_BUILD_TYPE=RELEASE=1
 
 before_install:
+    # Setup MSYS2
+    - |-
+        case $TRAVIS_OS_NAME in
+          windows)
+            [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
+            choco uninstall -y mingw
+            choco upgrade --no-progress -y msys2
+            export msys2='cmd //C RefreshEnv.cmd '
+            export msys2+='& set MSYS=winsymlinks:nativestrict '
+            export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
+            export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
+            export msys2+=" -msys2 -c "\"\$@"\" --"
+            $msys2 pacman --sync --noconfirm --needed mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
+            taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
+            export PATH=/C/tools/msys64/mingw64/bin:$PATH
+            export MAKE=mingw32-make  # so that Autotools can find it
+            ;;
+        esac
+
     # Set URL for Discord send script
     - DISCORD_SEND_SCRIPT_URL=https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
     - DISCORD_SEND_SCRIPT_FILENAME=discordSendNotification.sh
@@ -46,10 +69,10 @@ before_install:
     - echo $MAKE_BUILD_TYPE
 
     # Display compilers name/version
-    - echo ${CC}
-    - echo ${CXX}
-    - ${CC} --version
-    - ${CXX} --version
+    - $mingw64 echo ${CC}
+    - $mingw64 echo ${CXX}
+    - $mingw64 ${CC} --version
+    - $mingw64 ${CXX} --version
 
 install:
     # Get number of cores (or 2 by default if somehow none of these are available somehow)
@@ -58,10 +81,10 @@ install:
 
 script:
     # Compile 32-bit build
-    - make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=i686-w64-mingw32-windres
+    - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=i686-w64-mingw32-windres
 
     # Compile 64-bit build
-    - make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=x86_64-w64-mingw32-windres
+    - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=x86_64-w64-mingw32-windres
 
 after_success:
     # Send success notification to Discord through DISCORD_WEBHOOK_URL
@@ -74,3 +97,12 @@ after_failure:
     - travis_retry wget ${DISCORD_SEND_SCRIPT_URL} -O ${DISCORD_SEND_SCRIPT_FILENAME}
     - chmod +x ${DISCORD_SEND_SCRIPT_FILENAME}
     - ./${DISCORD_SEND_SCRIPT_FILENAME} failure $DISCORD_WEBHOOK_URL
+
+before_cache:
+    - |-
+        case $TRAVIS_OS_NAME in
+          windows)
+            # https://unix.stackexchange.com/a/137322/107554
+            $msys2 pacman --sync --clean --noconfirm
+            ;;
+        esac

From cbe6262e740a77df0d93458194f439ea0ba2ef9a Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 15:26:25 +0000
Subject: [PATCH 03/22] Try to fix whatever syntax error Travis isn't...

...telling me about.

Also this 50 letter limit is stupid
---
 .travis.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33cac740..5a5bdbb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,18 @@ dist: bionic
 # Enable C++ language support
 language: cpp
 
+before_cache:
+    - |-
+        case $TRAVIS_OS_NAME in
+          windows)
+            # https://unix.stackexchange.com/a/137322/107554
+            $msys2 pacman --sync --clean --noconfirm
+            ;;
+        esac
+
 # Cache compiled object files with ccache
-cache: ccache
+cache:
+    ccache
     directories:
     - $HOME/AppData/Local/Temp/chocolatey
     - /C/tools/msys64
@@ -97,12 +107,3 @@ after_failure:
     - travis_retry wget ${DISCORD_SEND_SCRIPT_URL} -O ${DISCORD_SEND_SCRIPT_FILENAME}
     - chmod +x ${DISCORD_SEND_SCRIPT_FILENAME}
     - ./${DISCORD_SEND_SCRIPT_FILENAME} failure $DISCORD_WEBHOOK_URL
-
-before_cache:
-    - |-
-        case $TRAVIS_OS_NAME in
-          windows)
-            # https://unix.stackexchange.com/a/137322/107554
-            $msys2 pacman --sync --clean --noconfirm
-            ;;
-        esac

From 05e0b49c29dae172fd7e8788cb07fe8b98dff3ac Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 15:28:41 +0000
Subject: [PATCH 04/22] Work already dammit

---
 .travis.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a5bdbb1..8951c70e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,22 +8,6 @@ dist: bionic
 # Enable C++ language support
 language: cpp
 
-before_cache:
-    - |-
-        case $TRAVIS_OS_NAME in
-          windows)
-            # https://unix.stackexchange.com/a/137322/107554
-            $msys2 pacman --sync --clean --noconfirm
-            ;;
-        esac
-
-# Cache compiled object files with ccache
-cache:
-    ccache
-    directories:
-    - $HOME/AppData/Local/Temp/chocolatey
-    - /C/tools/msys64
-
 compiler:
     - gcc
 
@@ -84,6 +68,22 @@ before_install:
     - $mingw64 ${CC} --version
     - $mingw64 ${CXX} --version
 
+before_cache:
+    - |-
+        case $TRAVIS_OS_NAME in
+          windows)
+            # https://unix.stackexchange.com/a/137322/107554
+            $msys2 pacman --sync --clean --noconfirm
+            ;;
+        esac
+
+# Cache compiled object files with ccache
+cache:
+#    ccache
+    directories:
+    - $HOME/AppData/Local/Temp/chocolatey
+    - /C/tools/msys64
+
 install:
     # Get number of cores (or 2 by default if somehow none of these are available somehow)
     - JOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 2)

From c793e302dba9ef6eb3a8604d5ff2ed6d782ef0bd Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 15:38:13 +0000
Subject: [PATCH 05/22] Dummy out 32-bit for now

Travis's example Windows script is 64-bit-only. I'll hack it up in a
bit.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8951c70e..fafa3855 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,7 +91,7 @@ install:
 
 script:
     # Compile 32-bit build
-    - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=i686-w64-mingw32-windres
+   # - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=i686-w64-mingw32-windres
 
     # Compile 64-bit build
     - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=x86_64-w64-mingw32-windres

From 5ac0f5d160cae9282f6094b012454ea00c55f7a9 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 15:55:36 +0000
Subject: [PATCH 06/22] Install regular make?

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fafa3855..f231ae95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ before_install:
             export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
             export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
             export msys2+=" -msys2 -c "\"\$@"\" --"
-            $msys2 pacman --sync --noconfirm --needed mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
+            $msys2 pacman --sync --noconfirm --needed make mingw-w64-x86_64-toolchain
             taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
             export PATH=/C/tools/msys64/mingw64/bin:$PATH
             export MAKE=mingw32-make  # so that Autotools can find it

From cd415916ac95c8a721f4373aa3d91daae7c08d87 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:12:33 +0000
Subject: [PATCH 07/22] Travis: Try to fix WINDRES and 32-bit builds

---
 .travis.yml | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f231ae95..39c339a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,12 +40,13 @@ before_install:
             export msys2='cmd //C RefreshEnv.cmd '
             export msys2+='& set MSYS=winsymlinks:nativestrict '
             export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
+            export mingw64="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
             export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
             export msys2+=" -msys2 -c "\"\$@"\" --"
-            $msys2 pacman --sync --noconfirm --needed make mingw-w64-x86_64-toolchain
+            $msys2 pacman --sync --noconfirm --needed make mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
             taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
-            export PATH=/C/tools/msys64/mingw64/bin:$PATH
-            export MAKE=mingw32-make  # so that Autotools can find it
+#            export PATH=/C/tools/msys64/mingw64/bin:$PATH
+#            export MAKE=mingw32-make  # so that Autotools can find it
             ;;
         esac
 
@@ -62,11 +63,34 @@ before_install:
     # Display build type
     - echo $MAKE_BUILD_TYPE
 
+    # Define WINDRES
+    - if [ "$TRAVIS_OS_NAME" = "windows" ];
+      then;
+        export WINDRES32="windres"
+        export WINDRES64="windres"
+      else;
+        export WINDRES32="i686-w64-mingw32-windres"
+        export WINDRES64="x86_64-w64-mingw32-windres"
+      fi
+
     # Display compilers name/version
-    - $mingw64 echo ${CC}
-    - $mingw64 echo ${CXX}
-    - $mingw64 ${CC} --version
-    - $mingw64 ${CXX} --version
+    - if [ "$TRAVIS_OS_NAME" = "windows" ];
+      then;
+        $mingw32 echo ${CC};
+        $mingw32 echo ${CXX};
+        $mingw32 ${CC} --version;
+        $mingw32 ${CXX} --version;
+
+        $mingw64 echo ${CC};
+        $mingw64 echo ${CXX};
+        $mingw64 ${CC} --version;
+        $mingw64 ${CXX} --version;
+      else;
+        echo ${CC};
+        echo ${CXX};
+        ${CC} --version;
+        ${CXX} --version;
+      fi
 
 before_cache:
     - |-
@@ -91,10 +115,10 @@ install:
 
 script:
     # Compile 32-bit build
-   # - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=i686-w64-mingw32-windres
+    - $mingw32 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=${WINDRES32}
 
     # Compile 64-bit build
-    - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=x86_64-w64-mingw32-windres
+    - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=${WINDRES64}
 
 after_success:
     # Send success notification to Discord through DISCORD_WEBHOOK_URL

From e45bac46dbb9c42f633e77bc4131e221de799ea7 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:14:51 +0000
Subject: [PATCH 08/22] Clearly I don't understand Bash syntax

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39c339a2..c91def2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,17 +65,17 @@ before_install:
 
     # Define WINDRES
     - if [ "$TRAVIS_OS_NAME" = "windows" ];
-      then;
+      then
         export WINDRES32="windres"
         export WINDRES64="windres"
-      else;
+      else
         export WINDRES32="i686-w64-mingw32-windres"
         export WINDRES64="x86_64-w64-mingw32-windres"
       fi
 
     # Display compilers name/version
     - if [ "$TRAVIS_OS_NAME" = "windows" ];
-      then;
+      then
         $mingw32 echo ${CC};
         $mingw32 echo ${CXX};
         $mingw32 ${CC} --version;
@@ -85,7 +85,7 @@ before_install:
         $mingw64 echo ${CXX};
         $mingw64 ${CC} --version;
         $mingw64 ${CXX} --version;
-      else;
+      else
         echo ${CC};
         echo ${CXX};
         ${CC} --version;

From ae016bbcf62802db3f7926f2ab8435084a2e1aa3 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:15:24 +0000
Subject: [PATCH 09/22] ...And again

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c91def2d..81e14eab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,16 +76,16 @@ before_install:
     # Display compilers name/version
     - if [ "$TRAVIS_OS_NAME" = "windows" ];
       then
-        $mingw32 echo ${CC};
-        $mingw32 echo ${CXX};
-        $mingw32 ${CC} --version;
-        $mingw32 ${CXX} --version;
+        $mingw32 echo ${CC}
+        $mingw32 echo ${CXX}
+        $mingw32 ${CC} --version
+        $mingw32 ${CXX} --version
 
-        $mingw64 echo ${CC};
-        $mingw64 echo ${CXX};
-        $mingw64 ${CC} --version;
-        $mingw64 ${CXX} --version;
-      else
+        $mingw64 echo ${CC}
+        $mingw64 echo ${CXX}
+        $mingw64 ${CC} --version
+        $mingw64 ${CXX} --version
+      ;else
         echo ${CC};
         echo ${CXX};
         ${CC} --version;

From 31fa8f735248fd7da31174f8cfe4cfd7db91e1d6 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:19:07 +0000
Subject: [PATCH 10/22] Say it with me: "this is annoying"

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

diff --git a/.travis.yml b/.travis.yml
index 81e14eab..3a79b3f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,8 +74,8 @@ before_install:
       fi
 
     # Display compilers name/version
-    - if [ "$TRAVIS_OS_NAME" = "windows" ];
-      then
+    - |
+      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
         $mingw32 echo ${CC}
         $mingw32 echo ${CXX}
         $mingw32 ${CC} --version
@@ -85,11 +85,11 @@ before_install:
         $mingw64 echo ${CXX}
         $mingw64 ${CC} --version
         $mingw64 ${CXX} --version
-      ;else
-        echo ${CC};
-        echo ${CXX};
-        ${CC} --version;
-        ${CXX} --version;
+      else
+        echo ${CC}
+        echo ${CXX}
+        ${CC} --version
+        ${CXX} --version
       fi
 
 before_cache:

From 871e443f90054c50f8a20981dd85f0cf5a65454c Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:20:09 +0000
Subject: [PATCH 11/22] swearing

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a79b3f2..2155b897 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,8 +64,8 @@ before_install:
     - echo $MAKE_BUILD_TYPE
 
     # Define WINDRES
-    - if [ "$TRAVIS_OS_NAME" = "windows" ];
-      then
+    - |
+      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
         export WINDRES32="windres"
         export WINDRES64="windres"
       else

From 057e76227958f891543c1b09d6ac0f4b19ac414c Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:25:31 +0000
Subject: [PATCH 12/22] Screw you Travis

---
 .travis.yml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2155b897..09501985 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,34 +63,6 @@ before_install:
     # Display build type
     - echo $MAKE_BUILD_TYPE
 
-    # Define WINDRES
-    - |
-      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-        export WINDRES32="windres"
-        export WINDRES64="windres"
-      else
-        export WINDRES32="i686-w64-mingw32-windres"
-        export WINDRES64="x86_64-w64-mingw32-windres"
-      fi
-
-    # Display compilers name/version
-    - |
-      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-        $mingw32 echo ${CC}
-        $mingw32 echo ${CXX}
-        $mingw32 ${CC} --version
-        $mingw32 ${CXX} --version
-
-        $mingw64 echo ${CC}
-        $mingw64 echo ${CXX}
-        $mingw64 ${CC} --version
-        $mingw64 ${CXX} --version
-      else
-        echo ${CC}
-        echo ${CXX}
-        ${CC} --version
-        ${CXX} --version
-      fi
 
 before_cache:
     - |-

From d4214e6dc97edadd9f11e28cb90496a0a091bb20 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:27:45 +0000
Subject: [PATCH 13/22] ???

---
 .travis.yml | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09501985..d1d06f78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,13 +40,11 @@ before_install:
             export msys2='cmd //C RefreshEnv.cmd '
             export msys2+='& set MSYS=winsymlinks:nativestrict '
             export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
-            export mingw64="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
+            export mingw32="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
             export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
             export msys2+=" -msys2 -c "\"\$@"\" --"
             $msys2 pacman --sync --noconfirm --needed make mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
             taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
-#            export PATH=/C/tools/msys64/mingw64/bin:$PATH
-#            export MAKE=mingw32-make  # so that Autotools can find it
             ;;
         esac
 
@@ -63,6 +61,34 @@ before_install:
     # Display build type
     - echo $MAKE_BUILD_TYPE
 
+    # Define WINDRES
+    - |
+      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
+        WINDRES32="windres"
+        WINDRES64="windres"
+      else
+        WINDRES32="i686-w64-mingw32-windres"
+        WINDRES64="x86_64-w64-mingw32-windres"
+      fi
+
+    # Display compilers name/version
+    - |
+      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
+        $mingw32 echo ${CC}
+        $mingw32 echo ${CXX}
+        $mingw32 ${CC} --version
+        $mingw32 ${CXX} --version
+
+        $mingw64 echo ${CC}
+        $mingw64 echo ${CXX}
+        $mingw64 ${CC} --version
+        $mingw64 ${CXX} --version
+      else
+        echo ${CC}
+        echo ${CXX}
+        ${CC} --version
+        ${CXX} --version
+      fi
 
 before_cache:
     - |-

From a20b906257f661b4c7efe465718b281c9678805d Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:38:51 +0000
Subject: [PATCH 14/22] Fix some stupid error that was caused by...

...literally nothing
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d1d06f78..f4672fa3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,8 @@ before_install:
             export msys2+=" -msys2 -c "\"\$@"\" --"
             $msys2 pacman --sync --noconfirm --needed make mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
             taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
+            export PATH=/C/tools/msys64/mingw64/bin:$PATH
+            export MAKE=mingw32-make  # so that Autotools can find it
             ;;
         esac
 

From 91f71d4030a1b1e7835a9589bd66454dedf406ec Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:57:58 +0000
Subject: [PATCH 15/22] Try to split 32-bit/64-bit builds

---
 .travis.yml | 62 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4672fa3..552a4aa0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,8 @@ addons:
 env:
     - MAKE_BUILD_TYPE=RELEASE=0
     - MAKE_BUILD_TYPE=RELEASE=1
+    - SIXTY_FOUR_BIT=false
+    - SIXTY_FOUR_BIT=true
 
 before_install:
     # Setup MSYS2
@@ -40,10 +42,17 @@ before_install:
             export msys2='cmd //C RefreshEnv.cmd '
             export msys2+='& set MSYS=winsymlinks:nativestrict '
             export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
-            export mingw32="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
-            export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
+            if [ "$SIXTY_FOUR_BIT" == "true" ]; then
+                export mingw="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
+            else
+                export mingw="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
+            fi
             export msys2+=" -msys2 -c "\"\$@"\" --"
-            $msys2 pacman --sync --noconfirm --needed make mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
+            if [ "$SIXTY_FOUR_BIT" == "true" ]; then
+                $msys2 pacman --sync --noconfirm --needed make mingw-w64-x86_64-toolchain
+            else
+                $msys2 pacman --sync --noconfirm --needed make mingw-w64-i686-toolchain
+            fi
             taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
             export PATH=/C/tools/msys64/mingw64/bin:$PATH
             export MAKE=mingw32-make  # so that Autotools can find it
@@ -63,34 +72,32 @@ before_install:
     # Display build type
     - echo $MAKE_BUILD_TYPE
 
+	# Define CC and CXX
+    if ["$SIXTY_FOUR_BIT" == "true"
+      export CC="x86_64-w64-mingw32-gcc"
+      export CXX="x86_64-w64-mingw32-g++"
+    else
+      export CC="i686-w64-mingw32-gcc"
+      export CXX="i686-w64-mingw32-g++"
+    fi
+
     # Define WINDRES
     - |
       if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-        WINDRES32="windres"
-        WINDRES64="windres"
+        export WINDRES="windres"
       else
-        WINDRES32="i686-w64-mingw32-windres"
-        WINDRES64="x86_64-w64-mingw32-windres"
+        if ["$SIXTY_FOUR_BIT" == "true"
+          export WINDRES="x86_64-w64-mingw32-windres"
+        else
+          export WINDRES="i686-w64-mingw32-windres"
+        fi
       fi
 
     # Display compilers name/version
-    - |
-      if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-        $mingw32 echo ${CC}
-        $mingw32 echo ${CXX}
-        $mingw32 ${CC} --version
-        $mingw32 ${CXX} --version
-
-        $mingw64 echo ${CC}
-        $mingw64 echo ${CXX}
-        $mingw64 ${CC} --version
-        $mingw64 ${CXX} --version
-      else
-        echo ${CC}
-        echo ${CXX}
-        ${CC} --version
-        ${CXX} --version
-      fi
+    $mingw echo ${CC}
+    $mingw echo ${CXX}
+    $mingw ${CC} --version
+    $mingw ${CXX} --version
 
 before_cache:
     - |-
@@ -114,11 +121,8 @@ install:
     - echo $JOBS
 
 script:
-    # Compile 32-bit build
-    - $mingw32 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ WINDRES=${WINDRES32}
-
-    # Compile 64-bit build
-    - $mingw64 make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ WINDRES=${WINDRES64}
+    # Build
+    - $mingw make -j ${JOBS} FIX_BUGS=1 ${MAKE_BUILD_TYPE} WARNINGS=1 WARNINGS_ALL=1 WINDOWS=1 STATIC=1
 
 after_success:
     # Send success notification to Discord through DISCORD_WEBHOOK_URL

From e504f076504dee358c83a118476062f70b64285c Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:59:20 +0000
Subject: [PATCH 16/22] ...Try again

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

diff --git a/.travis.yml b/.travis.yml
index 552a4aa0..2b7bea1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,8 +72,8 @@ before_install:
     # Display build type
     - echo $MAKE_BUILD_TYPE
 
-	# Define CC and CXX
-    if ["$SIXTY_FOUR_BIT" == "true"
+    # Define CC and CXX
+    if ["$SIXTY_FOUR_BIT" == "true"]; then
       export CC="x86_64-w64-mingw32-gcc"
       export CXX="x86_64-w64-mingw32-g++"
     else
@@ -86,7 +86,7 @@ before_install:
       if [ "$TRAVIS_OS_NAME" = "windows" ]; then
         export WINDRES="windres"
       else
-        if ["$SIXTY_FOUR_BIT" == "true"
+        if ["$SIXTY_FOUR_BIT" == "true" ]; then
           export WINDRES="x86_64-w64-mingw32-windres"
         else
           export WINDRES="i686-w64-mingw32-windres"

From 1b64bb71b7d7a6e6035b005a25d4db53ee863562 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 17:00:12 +0000
Subject: [PATCH 17/22] Life is pain

---
 .travis.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b7bea1f..917c0c0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,13 +73,14 @@ before_install:
     - echo $MAKE_BUILD_TYPE
 
     # Define CC and CXX
-    if ["$SIXTY_FOUR_BIT" == "true"]; then
-      export CC="x86_64-w64-mingw32-gcc"
-      export CXX="x86_64-w64-mingw32-g++"
-    else
-      export CC="i686-w64-mingw32-gcc"
-      export CXX="i686-w64-mingw32-g++"
-    fi
+    - |
+      if ["$SIXTY_FOUR_BIT" == "true"]; then
+        export CC="x86_64-w64-mingw32-gcc"
+        export CXX="x86_64-w64-mingw32-g++"
+      else
+        export CC="i686-w64-mingw32-gcc"
+        export CXX="i686-w64-mingw32-g++"
+      fi
 
     # Define WINDRES
     - |

From 2a74ab6d27a38c066bcc36aba659d197a61bb8c0 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 17:02:14 +0000
Subject: [PATCH 18/22] Place your bets

Will this random change fix it?
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 917c0c0d..c630d64d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,7 @@ before_install:
 
     # Define CC and CXX
     - |
-      if ["$SIXTY_FOUR_BIT" == "true"]; then
+      if [ "$SIXTY_FOUR_BIT" == "true" ]; then
         export CC="x86_64-w64-mingw32-gcc"
         export CXX="x86_64-w64-mingw32-g++"
       else
@@ -87,7 +87,7 @@ before_install:
       if [ "$TRAVIS_OS_NAME" = "windows" ]; then
         export WINDRES="windres"
       else
-        if ["$SIXTY_FOUR_BIT" == "true" ]; then
+        if [ "$SIXTY_FOUR_BIT" == "true" ]; then
           export WINDRES="x86_64-w64-mingw32-windres"
         else
           export WINDRES="i686-w64-mingw32-windres"

From 7f88a86916245bb94c27ef9b9501ab49615462db Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 17:05:25 +0000
Subject: [PATCH 19/22] Travis = >:(

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c630d64d..9bf79e78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,10 +95,10 @@ before_install:
       fi
 
     # Display compilers name/version
-    $mingw echo ${CC}
-    $mingw echo ${CXX}
-    $mingw ${CC} --version
-    $mingw ${CXX} --version
+    - $mingw echo ${CC}
+    - $mingw echo ${CXX}
+    - $mingw ${CC} --version
+    - $mingw ${CXX} --version
 
 before_cache:
     - |-

From d24006c966f6e664d7fe86fa5a60a554351db95c Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 17:07:41 +0000
Subject: [PATCH 20/22] Try to get environment variables right

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9bf79e78..352fa7ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,8 @@ addons:
         - mingw-w64
 
 env:
-    - MAKE_BUILD_TYPE=RELEASE=0
-    - MAKE_BUILD_TYPE=RELEASE=1
-    - SIXTY_FOUR_BIT=false
-    - SIXTY_FOUR_BIT=true
+    - MAKE_BUILD_TYPE=RELEASE=0 SIXTY_FOUR_BIT=false
+    - MAKE_BUILD_TYPE=RELEASE=1 SIXTY_FOUR_BIT=true
 
 before_install:
     # Setup MSYS2

From 0090c9a226d42e821a71391e30bbb3f940d1855b Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 17:08:39 +0000
Subject: [PATCH 21/22] And again

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 352fa7ac..9680d04b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,8 @@ addons:
 
 env:
     - MAKE_BUILD_TYPE=RELEASE=0 SIXTY_FOUR_BIT=false
+    - MAKE_BUILD_TYPE=RELEASE=1 SIXTY_FOUR_BIT=false
+    - MAKE_BUILD_TYPE=RELEASE=0 SIXTY_FOUR_BIT=true
     - MAKE_BUILD_TYPE=RELEASE=1 SIXTY_FOUR_BIT=true
 
 before_install:

From 8905a2ee4910140de729bf7d1de30609b9f938cd Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 17:27:44 +0000
Subject: [PATCH 22/22] Try to get ccache working again

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9680d04b..7fb6a84c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ dist: bionic
 # Enable C++ language support
 language: cpp
 
+# Cache compiled object files with ccache
+cache: ccache
+
 compiler:
     - gcc
 
@@ -109,9 +112,7 @@ before_cache:
             ;;
         esac
 
-# Cache compiled object files with ccache
 cache:
-#    ccache
     directories:
     - $HOME/AppData/Local/Temp/chocolatey
     - /C/tools/msys64