From 7be8c0017efbaf0e7abc83db42e261743ebe0cd0 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 19:20:51 -0400
Subject: [PATCH 01/19] appveyor: let see what version of GCC are here

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

diff --git a/appveyor.yml b/appveyor.yml
index e0ee99c61..f9acf0a2f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -77,9 +77,9 @@ deploy:
     active_mode: false
     on:
       branch: master
-      appveyor_repo_tag: true
+      appveyor_repo_tag: false
 
 
 on_finish:
-#- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
-#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
+- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From 038a9f19cb55ac7d0786d9b69c7d2d74c7ebd58f Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 19:49:07 -0400
Subject: [PATCH 02/19] appveyor: let use GCC 4.9.3 from Mingw32

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

diff --git a/appveyor.yml b/appveyor.yml
index f9acf0a2f..33c0f3aab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
  CC: ccache
  CCACHE_CC: i686-w64-mingw32-gcc
  WINDRES: windres
- MINGW_SDK: c:\msys64\mingw32
+ MINGW_SDK: c:\MinGW
  CFLAGS: -Wall -W -Werror
  NASM_ZIP: nasm-2.12.01
  NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip

From df6d3de8cabbbe859ee1543b5427256e642a719c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 19:57:28 -0400
Subject: [PATCH 03/19] appveyor: use mingw32-gcc as compiler

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

diff --git a/appveyor.yml b/appveyor.yml
index 33c0f3aab..297ad0556 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,7 @@ os: MinGW
 
 environment:
  CC: ccache
- CCACHE_CC: i686-w64-mingw32-gcc
+ CCACHE_CC: mingw32-gcc
  WINDRES: windres
  MINGW_SDK: c:\MinGW
  CFLAGS: -Wall -W -Werror
@@ -75,9 +75,9 @@ deploy:
     folder: appveyor
     application:
     active_mode: false
-    on:
-      branch: master
-      appveyor_repo_tag: false
+#    on:
+#      branch: master
+#      appveyor_repo_tag: true
 
 
 on_finish:

From ab322179f59a56144ff9fff3da2deaa363a5299e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 19:59:15 -0400
Subject: [PATCH 04/19] appveyor: compile with GCC 4.9 warning flags

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

diff --git a/appveyor.yml b/appveyor.yml
index 297ad0556..8954257c8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,7 +47,7 @@ before_build:
 - upx -V
 - ccache -V
 - ccache -s
-- set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC53=1 CCACHE=1
+- set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC49=1 CCACHE=1
 
 build_script:
 - cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 clean

From f5ae094e5b7c7e200e3a411b88e14b297a4283a3 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 20:09:45 -0400
Subject: [PATCH 05/19] appveyor: fixup PATH

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

diff --git a/appveyor.yml b/appveyor.yml
index 8954257c8..246bf6fd1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,8 +40,8 @@ configuration:
 - DD
 
 before_build:
-- set Path=%MINGW_SDK%\bin;%Path%
-- i686-w64-mingw32-gcc --version
+- set PATH=%MINGW_SDK%\bin;%PATH%
+- mingw32-gcc --version
 - mingw32-make --version
 - nasm -v
 - upx -V
@@ -81,5 +81,5 @@ deploy:
 
 
 on_finish:
-- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
-- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
+#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From d79804c1191ca022b2d9f140030e426d7bfe6ddd Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 20:14:01 -0400
Subject: [PATCH 06/19] appveyor: call up Mingw GCC directly

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

diff --git a/appveyor.yml b/appveyor.yml
index 246bf6fd1..573ef74bd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,7 @@ os: MinGW
 
 environment:
  CC: ccache
- CCACHE_CC: mingw32-gcc
+ CCACHE_CC: C:\MinGW\bin\mingw32-gcc.exe
  WINDRES: windres
  MINGW_SDK: c:\MinGW
  CFLAGS: -Wall -W -Werror
@@ -41,7 +41,7 @@ configuration:
 
 before_build:
 - set PATH=%MINGW_SDK%\bin;%PATH%
-- mingw32-gcc --version
+- C:\MinGW\bin\mingw32-gcc.exe --version
 - mingw32-make --version
 - nasm -v
 - upx -V

From 1afe83250d95c7e2d0774a64e649d72c4e0ce398 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 20:40:00 -0400
Subject: [PATCH 07/19] appveyor: let use CCACHE_PATH

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 573ef74bd..61cbff191 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,8 @@ os: MinGW
 
 environment:
  CC: ccache
- CCACHE_CC: C:\MinGW\bin\mingw32-gcc.exe
+ CCACHE_CC: mingw32-gcc.exe
+ CCACHE_PATH: C:\MinGW\bin
  WINDRES: windres
  MINGW_SDK: c:\MinGW
  CFLAGS: -Wall -W -Werror

From ad9956294c5a2ef3b05bd2768c7381f733c99208 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 20:54:15 -0400
Subject: [PATCH 08/19] appveyor: revert MINGW_SDK

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

diff --git a/appveyor.yml b/appveyor.yml
index 61cbff191..94d1fdf5c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ environment:
  CCACHE_CC: mingw32-gcc.exe
  CCACHE_PATH: C:\MinGW\bin
  WINDRES: windres
- MINGW_SDK: c:\MinGW
+ MINGW_SDK: c:\msys64\mingw32
  CFLAGS: -Wall -W -Werror
  NASM_ZIP: nasm-2.12.01
  NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip

From e38329e965abcc0827a756465d6842d5a9cab062 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 21:04:16 -0400
Subject: [PATCH 09/19] appveyor: reenable RDP

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

diff --git a/appveyor.yml b/appveyor.yml
index 94d1fdf5c..22187831a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -83,4 +83,4 @@ deploy:
 
 on_finish:
 #- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
-#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From ae4f68088897792bf001348233fa19afdcee7030 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 21:23:28 -0400
Subject: [PATCH 10/19] appveyor: add both Mingw folders into the PATH

---
 appveyor.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 22187831a..6dcd32014 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,9 +2,7 @@ version: 2.1.16.{branch}-{build}
 os: MinGW
 
 environment:
- CC: ccache
- CCACHE_CC: mingw32-gcc.exe
- CCACHE_PATH: C:\MinGW\bin
+ CC: mingw32-gcc.exe
  WINDRES: windres
  MINGW_SDK: c:\msys64\mingw32
  CFLAGS: -Wall -W -Werror
@@ -41,8 +39,8 @@ configuration:
 - DD
 
 before_build:
-- set PATH=%MINGW_SDK%\bin;%PATH%
-- C:\MinGW\bin\mingw32-gcc.exe --version
+- set PATH=%MINGW_SDK%\bin;C:\Mingw\bin;%PATH%
+- mingw32-gcc.exe --version
 - mingw32-make --version
 - nasm -v
 - upx -V

From ad32803370fae55e57a6d5d4b114b203bea45c21 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 6 Sep 2016 21:23:28 -0400
Subject: [PATCH 11/19] appveyor: disable FTP upload and RDP

---
 appveyor.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6dcd32014..13ee48f79 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -62,18 +62,18 @@ after_build:
 
 test: off
 
-deploy:
-  - provider: FTP
-    protocol: ftps
-    host: 
-      secure: NsLJEPIBvmwCOj8Tg8RoRQ==
-    username:
-      secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
-    password:
-      secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
-    folder: appveyor
-    application:
-    active_mode: false
+#deploy:
+#  - provider: FTP
+#    protocol: ftps
+#    host: 
+#      secure: NsLJEPIBvmwCOj8Tg8RoRQ==
+#    username:
+#      secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
+#    password:
+#      secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
+#    folder: appveyor
+#    application:
+#    active_mode: false
 #    on:
 #      branch: master
 #      appveyor_repo_tag: true
@@ -81,4 +81,4 @@ deploy:
 
 on_finish:
 #- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
-- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From c2ddbed90bcc0f025e350e126dd1d229195c8275 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 20:42:16 -0500
Subject: [PATCH 12/19] appveyor: download GCC 4.8.1-4 and try to abuse it

---
 appveyor.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 13ee48f79..8297ac179 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,6 +14,8 @@ environment:
  CCACHE_URL: http://alam.srb2.org/ccache.exe
  CCACHE_COMPRESS: true
  CCACHE_DIR: C:\Users\appveyor\.ccache
+ MINGW_LZMA: gcc-core-4.8.1-4-mingw32-bin.tar.lzma
+ MINGW_URL: http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma
 
 cache:
 - nasm-2.12.01.zip
@@ -34,6 +36,10 @@ install:
 - ccache -M 99M
 - xcopy /Y /V /I ccache.exe %MINGW_SDK%\bin
 
+- if not exist "%MINGW_LZMA%" appveyor DownloadFile "MINGW_URL%" -FileName "%MINGW_LZMA%"
+- 7z x -y "%MINGW_LZMA%" -o%TMP% >null
+- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin %MINGW_SDK%\bin || exit 0
+
 configuration:
 - SDL
 - DD

From 8d1a2e3453530f7e86d1b990fafa96caa61a80b0 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 20:44:28 -0500
Subject: [PATCH 13/19] appveyor:fixup download of mingw gcc lzma

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

diff --git a/appveyor.yml b/appveyor.yml
index 8297ac179..b077895b9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ install:
 - ccache -M 99M
 - xcopy /Y /V /I ccache.exe %MINGW_SDK%\bin
 
-- if not exist "%MINGW_LZMA%" appveyor DownloadFile "MINGW_URL%" -FileName "%MINGW_LZMA%"
+- if not exist "%MINGW_LZMA%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_LZMA%"
 - 7z x -y "%MINGW_LZMA%" -o%TMP% >null
 - robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin %MINGW_SDK%\bin || exit 0
 

From b1c323d87f1db7442fda594036022319886a40f9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 20:49:31 -0500
Subject: [PATCH 14/19] appveyor: decompress twice

---
 appveyor.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b077895b9..bf9b22ff7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
  CCACHE_URL: http://alam.srb2.org/ccache.exe
  CCACHE_COMPRESS: true
  CCACHE_DIR: C:\Users\appveyor\.ccache
- MINGW_LZMA: gcc-core-4.8.1-4-mingw32-bin.tar.lzma
+ MINGW_TAR: gcc-core-4.8.1-4-mingw32-bin.tar
  MINGW_URL: http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma
 
 cache:
@@ -36,8 +36,9 @@ install:
 - ccache -M 99M
 - xcopy /Y /V /I ccache.exe %MINGW_SDK%\bin
 
-- if not exist "%MINGW_LZMA%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_LZMA%"
-- 7z x -y "%MINGW_LZMA%" -o%TMP% >null
+- if not exist "%MINGW_TAR%.lzma" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_TAR%.lzma"
+- 7z x -y "%MINGW_TAR%.lzma" -o%TMP% >null
+- 7z x -y "%TMP%\%MINGW_TAR%" -o %TMP% >null
 - robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin %MINGW_SDK%\bin || exit 0
 
 configuration:

From 2ac5fef402b2dce890bcab0c813365940c6da6dd Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 20:51:04 -0500
Subject: [PATCH 15/19] appveyor: fixup 2nd extract and cache lzma

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index bf9b22ff7..e5f051b1a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,6 +21,7 @@ cache:
 - nasm-2.12.01.zip
 - upx391w.zip
 - ccache.exe
+- gcc-core-4.8.1-4-mingw32-bin.tar.lzma
 - C:\Users\appveyor\.ccache
 
 install:
@@ -38,7 +39,7 @@ install:
 
 - if not exist "%MINGW_TAR%.lzma" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_TAR%.lzma"
 - 7z x -y "%MINGW_TAR%.lzma" -o%TMP% >null
-- 7z x -y "%TMP%\%MINGW_TAR%" -o %TMP% >null
+- 7z x -y "%TMP%\%MINGW_TAR%" -o%TMP% >null
 - robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin %MINGW_SDK%\bin || exit 0
 
 configuration:

From fd29d77f1ef9699b5bf8fb2e568f93e8a86c23f0 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 20:59:54 -0500
Subject: [PATCH 16/19] appveyor: copy files to C:\Mingw

---
 appveyor.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index e5f051b1a..f939db061 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,8 @@ version: 2.1.16.{branch}-{build}
 os: MinGW
 
 environment:
- CC: mingw32-gcc.exe
+ CC: ccache
+ CCACHE_CC: mingw32-gcc
  WINDRES: windres
  MINGW_SDK: c:\msys64\mingw32
  CFLAGS: -Wall -W -Werror
@@ -40,7 +41,7 @@ install:
 - if not exist "%MINGW_TAR%.lzma" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_TAR%.lzma"
 - 7z x -y "%MINGW_TAR%.lzma" -o%TMP% >null
 - 7z x -y "%TMP%\%MINGW_TAR%" -o%TMP% >null
-- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin %MINGW_SDK%\bin || exit 0
+- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin C:\Mingw\bin || exit 0
 
 configuration:
 - SDL
@@ -54,7 +55,7 @@ before_build:
 - upx -V
 - ccache -V
 - ccache -s
-- set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC49=1 CCACHE=1
+- set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC48=1 CCACHE=1
 
 build_script:
 - cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 clean

From 4fe217f1a6c1eac363fa007f9f8d2a31f7617f4e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 21:07:02 -0500
Subject: [PATCH 17/19] appveyor: download GCC DLLs and debug issue

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

diff --git a/appveyor.yml b/appveyor.yml
index f939db061..e2fe9d7b0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,13 +15,16 @@ environment:
  CCACHE_URL: http://alam.srb2.org/ccache.exe
  CCACHE_COMPRESS: true
  CCACHE_DIR: C:\Users\appveyor\.ccache
- MINGW_TAR: gcc-core-4.8.1-4-mingw32-bin.tar
- MINGW_URL: http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma
+ MINGW_BIN_TAR: gcc-core-4.8.1-4-mingw32-bin.tar
+ MINGW_BIN_URL: http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma
+ MINGW_DLL_TAR: gcc-core-4.8.1-4-mingw32-dll.tar
+ MINGW_DLL_URL: http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma
 
 cache:
 - nasm-2.12.01.zip
 - upx391w.zip
 - ccache.exe
+- gcc-core-4.8.1-4-mingw32-dll.tar.lzma
 - gcc-core-4.8.1-4-mingw32-bin.tar.lzma
 - C:\Users\appveyor\.ccache
 
@@ -38,9 +41,13 @@ install:
 - ccache -M 99M
 - xcopy /Y /V /I ccache.exe %MINGW_SDK%\bin
 
-- if not exist "%MINGW_TAR%.lzma" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_TAR%.lzma"
-- 7z x -y "%MINGW_TAR%.lzma" -o%TMP% >null
-- 7z x -y "%TMP%\%MINGW_TAR%" -o%TMP% >null
+- if not exist "%MINGW_DLL_TAR%.lzma" appveyor DownloadFile "%MINGW_DLL_URL%" -FileName "%MINGW_DLL_TAR%.lzma"
+- 7z x -y "%MINGW_DLL_TAR%.lzma" -o%TMP% >null
+- 7z x -y "%TMP%\%MINGW_DLL_TAR%" -o%TMP% >null
+
+- if not exist "%MINGW_EXE_TAR%.lzma" appveyor DownloadFile "%MINGW_EXE_URL%" -FileName "%MINGW_EXE_TAR%.lzma"
+- 7z x -y "%MINGW_EXE_TAR%.lzma" -o%TMP% >null
+- 7z x -y "%TMP%\%MINGW_EXE_TAR%" -o%TMP% >null
 - robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin C:\Mingw\bin || exit 0
 
 configuration:
@@ -89,5 +96,5 @@ test: off
 
 
 on_finish:
-#- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
-#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
+- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From 721359974473bb45e34240a6c2e09d20b3cc34a1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 21:09:20 -0500
Subject: [PATCH 18/19] appveyor: MINGW_BIN, not MINGW_EXE

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

diff --git a/appveyor.yml b/appveyor.yml
index e2fe9d7b0..afe964c3b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,9 +45,9 @@ install:
 - 7z x -y "%MINGW_DLL_TAR%.lzma" -o%TMP% >null
 - 7z x -y "%TMP%\%MINGW_DLL_TAR%" -o%TMP% >null
 
-- if not exist "%MINGW_EXE_TAR%.lzma" appveyor DownloadFile "%MINGW_EXE_URL%" -FileName "%MINGW_EXE_TAR%.lzma"
-- 7z x -y "%MINGW_EXE_TAR%.lzma" -o%TMP% >null
-- 7z x -y "%TMP%\%MINGW_EXE_TAR%" -o%TMP% >null
+- if not exist "%MINGW_BIN_TAR%.lzma" appveyor DownloadFile "%MINGW_BIN_URL%" -FileName "%MINGW_BIN_TAR%.lzma"
+- 7z x -y "%MINGW_BIN_TAR%.lzma" -o%TMP% >null
+- 7z x -y "%TMP%\%MINGW_BIN_TAR%" -o%TMP% >null
 - robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin C:\Mingw\bin || exit 0
 
 configuration:

From 5a55c4ea8f68f924251a15c840f4c86b2ff97e7e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 6 Jan 2017 21:10:10 -0500
Subject: [PATCH 19/19] appveyor: RDP debug is broken

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

diff --git a/appveyor.yml b/appveyor.yml
index afe964c3b..b59ccd723 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -96,5 +96,5 @@ test: off
 
 
 on_finish:
-- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
-- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
+#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))