From 3db1a1fe9f6a93bf6b1f37439c73bb28c9903fb4 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 26 Jan 2016 23:30:53 -0500
Subject: [PATCH 01/56] add/test appveyor build

---
 appveyor.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..cf7fb850
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,4 @@
+version: 1.0.{build}
+os: MinGW
+build_script:
+- cmd: make -C src MINGW=1
\ No newline at end of file

From b8cafea40aebd5680d0d3808dc8f9f2e05277efc Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 26 Jan 2016 23:56:22 -0500
Subject: [PATCH 02/56] appveyor: full path to make binary and no asm or png
 support

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

diff --git a/appveyor.yml b/appveyor.yml
index cf7fb850..871e1319 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,5 @@
 version: 1.0.{build}
 os: MinGW
 build_script:
-- cmd: make -C src MINGW=1
\ No newline at end of file
+- cmd: C:\MinGW\bin\make.exe -C src MINGW=1 NOASM=1 NOPNG=1
+

From 21c30a396c692915cea33d1b964bd9b3c250560c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 00:11:54 -0500
Subject: [PATCH 03/56] appveyor: allow one to RDP to system to debug build
 system

---
 .gitattributes | 2 ++
 appveyor.yml   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 777bf189..ef775b91 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -29,4 +29,6 @@
 /libs/zlib/nintendods/README -whitespace
 /libs/zlib/watcom/watcom_f.mak -crlf -whitespace
 /libs/zlib/watcom/watcom_l.mak -crlf -whitespace
+#Appveyor
+/appveyor.yml -crlf -whitespace
 # Other
diff --git a/appveyor.yml b/appveyor.yml
index 871e1319..ee6e3e97 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,8 @@
 version: 1.0.{build}
 os: MinGW
+
 build_script:
 - cmd: C:\MinGW\bin\make.exe -C src MINGW=1 NOASM=1 NOPNG=1
 
+on_finish:
+-ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From 289b5506bff6b1a45aa8e54a044204e9c2e04d16 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 00:15:09 -0500
Subject: [PATCH 04/56] appveyor: whitespace?

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

diff --git a/appveyor.yml b/appveyor.yml
index ee6e3e97..cf84de50 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,3 +6,4 @@ build_script:
 
 on_finish:
 -ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+

From cbd85e6baff8608ad1a9044ce3d95bf91c47f7e2 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 00:27:28 -0500
Subject: [PATCH 05/56] appveyor: spacing

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

diff --git a/appveyor.yml b/appveyor.yml
index cf84de50..e871bb3e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,5 +5,5 @@ build_script:
 - cmd: C:\MinGW\bin\make.exe -C src MINGW=1 NOASM=1 NOPNG=1
 
 on_finish:
--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 8ad8533880232163d96d7ed34593035717ad6c3c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 01:09:51 -0500
Subject: [PATCH 06/56] appveyor: found mingw64 32-bit target, do not build
 with UPX

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

diff --git a/appveyor.yml b/appveyor.yml
index e871bb3e..6c531798 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,14 @@
 version: 1.0.{build}
 os: MinGW
 
+install:
+- set PATH=C:\mingw64\bin;%PATH%
+- set CC=i686-w64-mingw32-gcc
+- set WINDRES=windres
+
 build_script:
-- cmd: C:\MinGW\bin\make.exe -C src MINGW=1 NOASM=1 NOPNG=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1
 
 on_finish:
-- 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 113a3cd6fc53736ddb90960a88ee71ecc51ddb1e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 01:16:42 -0500
Subject: [PATCH 07/56] appveyor: try again

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

diff --git a/appveyor.yml b/appveyor.yml
index 6c531798..b965a113 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,12 +1,12 @@
-version: 1.0.{build}
+version: 2.1.14.{branch}-{build}
 os: MinGW
 
 install:
-- set PATH=C:\mingw64\bin;%PATH%
 - set CC=i686-w64-mingw32-gcc
 - set WINDRES=windres
 
 build_script:
+- set Path=C:\mingw64\bin;%Path%
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1
 
 on_finish:

From 85de668d1a4ea54f9fcb0c183206f562f8c80419 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 01:21:29 -0500
Subject: [PATCH 08/56] appveyor: move set to before_build, and drop gcc and
 make version

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

diff --git a/appveyor.yml b/appveyor.yml
index b965a113..69d4be7e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,8 +5,12 @@ install:
 - set CC=i686-w64-mingw32-gcc
 - set WINDRES=windres
 
+before_build:
+- set Path=c:\mingw64\bin;%Path%
+- i686-w64-mingw32-gcc --version
+- mingw32-make --version
+
 build_script:
-- set Path=C:\mingw64\bin;%Path%
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1
 
 on_finish:

From 6e1b9549fc9739f863d8c70c02df05c9fef5392d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 01:24:32 -0500
Subject: [PATCH 09/56] appveyor: fullpath to binaries

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

diff --git a/appveyor.yml b/appveyor.yml
index 69d4be7e..81f71cc8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,8 +7,8 @@ install:
 
 before_build:
 - set Path=c:\mingw64\bin;%Path%
-- i686-w64-mingw32-gcc --version
-- mingw32-make --version
+- c:\mingw64\bin\i686-w64-mingw32-gcc --version
+- c:\mingw64\bin\mingw32-make --version
 
 build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1

From 443562c3c01cfb96f3fa10e29f125e81e5b3954a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 01:26:36 -0500
Subject: [PATCH 10/56] appveyor: why is this failing

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

diff --git a/appveyor.yml b/appveyor.yml
index 81f71cc8..20644c55 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,5 +14,5 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1
 
 on_finish:
-#- 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 1a72f2f1db9220e21fafd38114e0864056065008 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 01:32:53 -0500
Subject: [PATCH 11/56] appveyor: wrong path...

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

diff --git a/appveyor.yml b/appveyor.yml
index 20644c55..a0cbfae4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,13 +6,13 @@ install:
 - set WINDRES=windres
 
 before_build:
-- set Path=c:\mingw64\bin;%Path%
-- c:\mingw64\bin\i686-w64-mingw32-gcc --version
-- c:\mingw64\bin\mingw32-make --version
+- set Path=c:\msys64\mingw32\bin;%Path%
+- i686-w64-mingw32-gcc --version
+- mingw32-make --version
 
 build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1
 
 on_finish:
-- 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 d0ce9170da8b6b4b2598883ec3938fb8016fd6d2 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 27 Jan 2016 01:39:12 -0500
Subject: [PATCH 12/56] appveyor: build for GCC 5.2

---
 appveyor.yml     |  2 +-
 src/Makefile.cfg | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index a0cbfae4..6c727568 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ before_build:
 - mingw32-make --version
 
 build_script:
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1
 
 on_finish:
 #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 1ea96df9..d6af0d8a 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -7,6 +7,22 @@
 # and other things
 #
 
+ifdef GCC53
+GCC52=1
+endif
+
+ifdef GCC52
+GCC51=1
+endif
+
+ifdef GCC51
+GCC49=1
+endif
+
+ifdef GCC49
+GCC48=1
+endif
+
 ifdef GCC48
 GCC47=1
 endif

From 5bf43171aeaec30e2ff4b2f6b697e2c4051d44d4 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 10:29:02 -0500
Subject: [PATCH 13/56] appveyor: let try SDL2 builds

---
 appveyor.yml | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6c727568..ccd9d577 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,18 +1,36 @@
 version: 2.1.14.{branch}-{build}
 os: MinGW
 
+cache:
+ SDL2-devel-2.0.4-mingw.tar.gz
+ 
+environment:
+ CC=i686-w64-mingw32-gcc
+ WINDRES=windres
+ MINGW_SDK=c:\msys64\mingw32
+ SDL2_URL=http://libsdl.org/release/SDL2-devel-2.0.4-mingw.tar.gz
+ SDL2_ARCHIVE=SDL2-devel-2.0.4-mingw.tar.gz
+ SDL2_MOVE=SDL2-2.0.4\i686-w64-mingw32
+
 install:
-- set CC=i686-w64-mingw32-gcc
-- set WINDRES=windres
+- if not exist "%SDL2_ARCHIVE%" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%"
+- 7z x -y "%MINGW_ARCHIVE%" -o%TMP% > nul
+- robocopy /S %TMP%\%SDL2_MOVE% %MINGW_SDK%
+- ps: (Get-Content %TMP%\%SDL2_MOVE%\bin\sdl2-config) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\bin\sdl2-config
+- ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake
+- ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\pkgconfig\sdl2.pc
 
 before_build:
-- set Path=c:\msys64\mingw32\bin;%Path%
+- set Path=%MINGW_SDK%\bin;%Path%
 - i686-w64-mingw32-gcc --version
 - mingw32-make --version
 
 build_script:
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 DEBUGMODE=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1 DEBUGMODE=1
 
 on_finish:
-#- 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 9422b994e4b0fc4612c3b6d8d05ce4f3f21eaf80 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 10:30:35 -0500
Subject: [PATCH 14/56] appveyor: fixup env block

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

diff --git a/appveyor.yml b/appveyor.yml
index ccd9d577..0236459a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,12 +5,12 @@ cache:
  SDL2-devel-2.0.4-mingw.tar.gz
  
 environment:
- CC=i686-w64-mingw32-gcc
- WINDRES=windres
- MINGW_SDK=c:\msys64\mingw32
- SDL2_URL=http://libsdl.org/release/SDL2-devel-2.0.4-mingw.tar.gz
- SDL2_ARCHIVE=SDL2-devel-2.0.4-mingw.tar.gz
- SDL2_MOVE=SDL2-2.0.4\i686-w64-mingw32
+ CC: i686-w64-mingw32-gcc
+ WINDRES: windres
+ MINGW_SDK: c:\msys64\mingw32
+ SDL2_URL: http://libsdl.org/release/SDL2-devel-2.0.4-mingw.tar.gz
+ SDL2_ARCHIVE: SDL2-devel-2.0.4-mingw.tar.gz
+ SDL2_MOVE: SDL2-2.0.4\i686-w64-mingw32
 
 install:
 - if not exist "%SDL2_ARCHIVE%" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%"

From e5dbd3cb9dc5cf2f8bbcb0e4ae291343c60ec717 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 10:40:28 -0500
Subject: [PATCH 15/56] appveyor: copy and paste mistake on extracting archive
 comannd

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

diff --git a/appveyor.yml b/appveyor.yml
index 0236459a..a8eb76a2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
 
 install:
 - if not exist "%SDL2_ARCHIVE%" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%"
-- 7z x -y "%MINGW_ARCHIVE%" -o%TMP% > nul
+- 7z x -y "%SDL2_ARCHIVE%" -o%TMP% >null
 - robocopy /S %TMP%\%SDL2_MOVE% %MINGW_SDK%
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\bin\sdl2-config) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\bin\sdl2-config
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake
@@ -32,5 +32,6 @@ build_script:
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1 DEBUGMODE=1
 
 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'))
 

From 9e1ba2e972057f6032c629dff4e6762b4f93d938 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 10:44:52 -0500
Subject: [PATCH 16/56] appvenyor: self note only

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

diff --git a/appveyor.yml b/appveyor.yml
index a8eb76a2..5c596d40 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,6 +32,6 @@ build_script:
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1 DEBUGMODE=1
 
 on_finish:
-- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
+#- 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 46f9e4a9615807084e5657ea638f5e69c4c0f0fa Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 10:52:40 -0500
Subject: [PATCH 17/56] appveyor: we need to run 7zip twice

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

diff --git a/appveyor.yml b/appveyor.yml
index 5c596d40..c4fcb64e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,12 +9,13 @@ environment:
  WINDRES: windres
  MINGW_SDK: c:\msys64\mingw32
  SDL2_URL: http://libsdl.org/release/SDL2-devel-2.0.4-mingw.tar.gz
- SDL2_ARCHIVE: SDL2-devel-2.0.4-mingw.tar.gz
+ SDL2_ARCHIVE: SDL2-devel-2.0.4-mingw.tar
  SDL2_MOVE: SDL2-2.0.4\i686-w64-mingw32
 
 install:
-- if not exist "%SDL2_ARCHIVE%" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%"
-- 7z x -y "%SDL2_ARCHIVE%" -o%TMP% >null
+- if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
+- 7z x -y "%SDL2_ARCHIVE%,gz" -o%TMP% >null
+- 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
 - robocopy /S %TMP%\%SDL2_MOVE% %MINGW_SDK%
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\bin\sdl2-config) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\bin\sdl2-config
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake

From ffe193ca3ead0af14f87695b4a4bdd5a193a94ff Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 10:55:38 -0500
Subject: [PATCH 18/56] appveyor: mistakes are easy to make

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

diff --git a/appveyor.yml b/appveyor.yml
index c4fcb64e..766894ba 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
 
 install:
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
-- 7z x -y "%SDL2_ARCHIVE%,gz" -o%TMP% >null
+- 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
 - robocopy /S %TMP%\%SDL2_MOVE% %MINGW_SDK%
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\bin\sdl2-config) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\bin\sdl2-config

From 53aa9322071bedd59876ed3870e4e99a68f54a36 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:03:08 -0500
Subject: [PATCH 19/56] appveyor: ingore robocopy errorcode

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

diff --git a/appveyor.yml b/appveyor.yml
index 766894ba..001b14a8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ install:
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
 - 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
-- robocopy /S %TMP%\%SDL2_MOVE% %MINGW_SDK%
+- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% && exit 0
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\bin\sdl2-config) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\bin\sdl2-config
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\pkgconfig\sdl2.pc

From e0f373381938d957c65598ae24556eb71815ab99 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:05:09 -0500
Subject: [PATCH 20/56] appveyor: hehe, OR

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

diff --git a/appveyor.yml b/appveyor.yml
index 001b14a8..db27725d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ install:
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
 - 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
-- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% && exit 0
+- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\bin\sdl2-config) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\bin\sdl2-config
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake
 - ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\pkgconfig\sdl2.pc

From 5ace352e71fcbb95eb55fd398b250b515916f88b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:16:24 -0500
Subject: [PATCH 21/56] appveyor: manually set SDL flags

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

diff --git a/appveyor.yml b/appveyor.yml
index db27725d..c1e5e108 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,12 +16,14 @@ install:
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
 - 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
-- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
-- ps: (Get-Content %TMP%\%SDL2_MOVE%\bin\sdl2-config) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\bin\sdl2-config
-- ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake
-- ps: (Get-Content %TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", "%MINGW_SDK%" } | Set-Content %MINGW_SDK%\lib\pkgconfig\sdl2.pc
+#- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
+#- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config"))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config")
+#- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake")) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake")
+#- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc"))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
 
 before_build:
+- set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main
+- set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows
 - set Path=%MINGW_SDK%\bin;%Path%
 - i686-w64-mingw32-gcc --version
 - mingw32-make --version

From 89786ff7fd396b3fbe37823222bb4a591f19c6da Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:22:46 -0500
Subject: [PATCH 22/56] appveyor: include the SDL header in depend step:

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

diff --git a/appveyor.yml b/appveyor.yml
index c1e5e108..5bac1b65 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,6 +22,7 @@ install:
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc"))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
 
 before_build:
+- set CPPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2
 - set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main
 - set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows
 - set Path=%MINGW_SDK%\bin;%Path%
@@ -36,5 +37,5 @@ build_script:
 
 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 f0842d2200a91d9d1744df70a27da9c4089d2fe6 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:33:36 -0500
Subject: [PATCH 23/56] appveyor: add debug and sdl mixer

---
 appveyor.yml | 17 ++++++++++++-----
 src/Makefile |  8 ++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5bac1b65..848755cb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,7 @@ os: MinGW
 
 cache:
  SDL2-devel-2.0.4-mingw.tar.gz
+ SDL2_mixer-devel-2.0.1-mingw.tar.gz
  
 environment:
  CC: i686-w64-mingw32-gcc
@@ -11,20 +12,26 @@ environment:
  SDL2_URL: http://libsdl.org/release/SDL2-devel-2.0.4-mingw.tar.gz
  SDL2_ARCHIVE: SDL2-devel-2.0.4-mingw.tar
  SDL2_MOVE: SDL2-2.0.4\i686-w64-mingw32
+ SDL2_MIXER_URL=https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.1-mingw.tar.gz
+ SDL2_MIXER_ARCHIVE: SDL2_mixer-devel-2.0.1-mingw.tar
+ SDL2_MIXER_MOVE: SDL2_mixer-2.0.1/i686-w64-mingw32
 
 install:
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
+- if not exist "%SDL2_MIXER_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_MIXER_URL%" -FileName "%SDL2_MIXER_ARCHIVE%.gz"
 - 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
+- 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
+- 7z x -y "%TMP%\%SSDL2_MIXER_ARCHIVE%" -o%TMP% >null
 #- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config"))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config")
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake")) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake")
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc"))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
 
 before_build:
-- set CPPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2
-- set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main
-- set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows
+- set CPPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
+- set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
+- set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
 - set Path=%MINGW_SDK%\bin;%Path%
 - i686-w64-mingw32-gcc --version
 - mingw32-make --version
@@ -32,8 +39,8 @@ before_build:
 build_script:
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 DEBUGMODE=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1 DEBUGMODE=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
 
 on_finish:
 #- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
diff --git a/src/Makefile b/src/Makefile
index d4cc64a4..8474a7e8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -703,13 +703,13 @@ $(OBJDIR)/depend.dep:
 	@echo "Creating dependency file, depend.dep"
 	@echo > comptime.h
 	-$(MKDIR) $(OBJDIR)
-	$(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
-	$(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
 ifndef NOHW
-	$(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
 endif
 ifndef NO_LUA
-	$(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
 endif
 	@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
 	$(REMOVE) $(OBJDIR)/depend.ped

From 50846880a61e4f6392bb4444bbf00fa9a1cd6497 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:34:19 -0500
Subject: [PATCH 24/56] appveyor: not = for envs

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

diff --git a/appveyor.yml b/appveyor.yml
index 848755cb..f55741af 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ environment:
  SDL2_URL: http://libsdl.org/release/SDL2-devel-2.0.4-mingw.tar.gz
  SDL2_ARCHIVE: SDL2-devel-2.0.4-mingw.tar
  SDL2_MOVE: SDL2-2.0.4\i686-w64-mingw32
- SDL2_MIXER_URL=https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.1-mingw.tar.gz
+ SDL2_MIXER_URL: https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.1-mingw.tar.gz
  SDL2_MIXER_ARCHIVE: SDL2_mixer-devel-2.0.1-mingw.tar
  SDL2_MIXER_MOVE: SDL2_mixer-2.0.1/i686-w64-mingw32
 

From 4230225a0c570b239c4f128940f3d53e49987cfa Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:36:51 -0500
Subject: [PATCH 25/56] appveor: SDL, not SSDL

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

diff --git a/appveyor.yml b/appveyor.yml
index f55741af..81f27df4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,7 +22,7 @@ install:
 - 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
 - 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
-- 7z x -y "%TMP%\%SSDL2_MIXER_ARCHIVE%" -o%TMP% >null
+- 7z x -y "%TMP%\%SDL2_MIXER_ARCHIVE%" -o%TMP% >null
 #- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config"))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config")
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake")) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake")

From 7a09a82489c1e8c292ef456cbfb83c1e6d362c63 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:41:02 -0500
Subject: [PATCH 26/56] new flags: DEPFLAGS, to tell the depend step where are
 the headers

---
 appveyor.yml | 2 +-
 src/Makefile | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 81f27df4..f7af7027 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,7 @@ install:
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc"))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
 
 before_build:
-- set CPPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
+- set DEPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
 - set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
 - set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
 - set Path=%MINGW_SDK%\bin;%Path%
diff --git a/src/Makefile b/src/Makefile
index 8474a7e8..2c1de64d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -703,13 +703,13 @@ $(OBJDIR)/depend.dep:
 	@echo "Creating dependency file, depend.dep"
 	@echo > comptime.h
 	-$(MKDIR) $(OBJDIR)
-	$(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
-	$(CC) $(CPPFLAGS) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(DEPFLAGS) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
+	$(CC) $(DEPFLAGS) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
 ifndef NOHW
-	$(CC) $(CPPFLAGS) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(DEPFLAGS) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
 endif
 ifndef NO_LUA
-	$(CC) $(CPPFLAGS) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(DEPFLAGS) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
 endif
 	@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
 	$(REMOVE) $(OBJDIR)/depend.ped

From 2176b21e62f0fd82ada5f4fb4d5e7afbea749b89 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:49:23 -0500
Subject: [PATCH 27/56] ignore noreturns

---
 src/Makefile.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index d6af0d8a..0e38a05c 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -159,6 +159,9 @@ ifndef MINGW
 ifdef GCC45
 WFLAGS+=-Wunsuffixed-float-constants
 endif
+ifdef GCC46
+WFLAGS+=-Wno-suggest-attribute=noreturn
+endif
 endif
 ifdef NOLDWARNING
 LDFLAGS+=-Wl,--as-needed
@@ -171,6 +174,7 @@ ifdef GCC43
 endif
 WFLAGS+=$(OLDWFLAGS)
 
+
 #indicate platform and what interface use with
 ifndef WINCE
 ifndef XBOX

From d762c4023ed4b1b1127c0960313c03c61c54b201 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 11:52:33 -0500
Subject: [PATCH 28/56] appveyor: show us all the commands

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

diff --git a/appveyor.yml b/appveyor.yml
index f7af7027..9f37a5f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,10 +37,10 @@ before_build:
 - mingw32-make --version
 
 build_script:
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 DEBUGMODE=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 ECHO=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 DEBUGMODE=1 ECHO=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 ECHO=1
 
 on_finish:
 #- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>

From 3c35ed60d3d9310077c3ebbde9e1595f025d7bb3 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 12:03:56 -0500
Subject: [PATCH 29/56] appveyor: fixup cache list

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

diff --git a/appveyor.yml b/appveyor.yml
index 9f37a5f1..eb2db8b8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,8 +2,8 @@ version: 2.1.14.{branch}-{build}
 os: MinGW
 
 cache:
- SDL2-devel-2.0.4-mingw.tar.gz
- SDL2_mixer-devel-2.0.1-mingw.tar.gz
+- SDL2-devel-2.0.4-mingw.tar.gz
+- SDL2_mixer-devel-2.0.1-mingw.tar.gz
  
 environment:
  CC: i686-w64-mingw32-gcc

From 7fdb5cfcfb045e6bfc2c3e4421adcdeca589bc82 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 12:06:00 -0500
Subject: [PATCH 30/56] move disabled warning out of mingw

---
 src/Makefile.cfg | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 0e38a05c..fa8896a7 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -155,13 +155,14 @@ WFLAGS+=-Wformat-security
 ifndef GCC29
 #WFLAGS+=-Winit-self
 endif
+ifdef GCC46
+WFLAGS+=-Wno-suggest-attribute=noreturn
+endif
+
 ifndef MINGW
 ifdef GCC45
 WFLAGS+=-Wunsuffixed-float-constants
 endif
-ifdef GCC46
-WFLAGS+=-Wno-suggest-attribute=noreturn
-endif
 endif
 ifdef NOLDWARNING
 LDFLAGS+=-Wl,--as-needed

From 10e1aaaf856c40282d646d04c3b9d3c61cd91b26 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 12:08:08 -0500
Subject: [PATCH 31/56] appveyor: no need for DEPFLAGS

---
 appveyor.yml | 1 -
 src/Makefile | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index eb2db8b8..51411d45 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,6 @@ install:
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc"))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
 
 before_build:
-- set DEPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
 - set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
 - set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
 - set Path=%MINGW_SDK%\bin;%Path%
diff --git a/src/Makefile b/src/Makefile
index 2c1de64d..d4cc64a4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -703,13 +703,13 @@ $(OBJDIR)/depend.dep:
 	@echo "Creating dependency file, depend.dep"
 	@echo > comptime.h
 	-$(MKDIR) $(OBJDIR)
-	$(CC) $(DEPFLAGS) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
-	$(CC) $(DEPFLAGS) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
+	$(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
 ifndef NOHW
-	$(CC) $(DEPFLAGS) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
 endif
 ifndef NO_LUA
-	$(CC) $(DEPFLAGS) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
+	$(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
 endif
 	@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
 	$(REMOVE) $(OBJDIR)/depend.ped

From 4d0e1a8a1c76dfb9aeb9fd7817de3d0bf190540a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 12:12:04 -0500
Subject: [PATCH 32/56] appveyor: do not echo the full command

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

diff --git a/appveyor.yml b/appveyor.yml
index 51411d45..f58a242d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,8 +38,8 @@ before_build:
 build_script:
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 ECHO=1
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 DEBUGMODE=1 ECHO=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 ECHO=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
 
 on_finish:
 #- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>

From 67b6d618a48e40082e40d04b12fdfa84710f79d1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 12:15:42 -0500
Subject: [PATCH 33/56] appveyor: build with/without the mixer and with/without
 OpenGL

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

diff --git a/appveyor.yml b/appveyor.yml
index f58a242d..a9dae4fb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,10 +36,23 @@ before_build:
 - mingw32-make --version
 
 build_script:
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 ECHO=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 DEBUGMODE=1 ECHO=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 NOMIXER=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 NOMIXER=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 NOMIXER=1
+
 
 on_finish:
 #- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>

From 0d327c7c16a0d4a8521911d4a16f10dfd2d00a6a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 21:15:51 -0500
Subject: [PATCH 34/56] kill logical-not-parentheses warning in g_game.c

g_game.c: In function 'G_CheckDemoStatus':
g_game.c:5588:22: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
   if (!modeattacking == ATTACKING_RECORD)
                      ^
---
 src/g_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/g_game.c b/src/g_game.c
index c59f23c0..de3b26f0 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5585,7 +5585,7 @@ boolean G_CheckDemoStatus(void)
 		free(demobuffer);
 		demorecording = false;
 
-		if (!modeattacking == ATTACKING_RECORD)
+		if (modeattacking != ATTACKING_RECORD)
 		{
 			if (saved)
 				CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);

From 050ce857c439bf0726de978e43a2dce2496f3d0e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 21:31:18 -0500
Subject: [PATCH 35/56] let not care for main() being noreturn

---
 src/sdl/i_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 976f7eb3..489ee4c0 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -240,8 +240,8 @@ int main(int argc, char **argv)
 #endif
 
 	// return to OS
-#ifndef __GNUC__
+//#ifndef __GNUC__
 	return 0;
-#endif
+//#endif
 }
 #endif

From c47ff7b3c6f22710e1478d789bd9399b6026690a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 21:37:41 -0500
Subject: [PATCH 36/56] let make the main() entry point noreturns

---
 src/sdl/i_main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 489ee4c0..d3f94f13 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -141,8 +141,10 @@ void XBoxStartup()
 	myargv = NULL;
 #else
 #ifdef FORCESDLMAIN
+FUNCNORETURN
 int SDL_main(int argc, char **argv)
 #else
+FUNCNORETURN
 int main(int argc, char **argv)
 #endif
 {
@@ -240,8 +242,8 @@ int main(int argc, char **argv)
 #endif
 
 	// return to OS
-//#ifndef __GNUC__
+#ifndef __GNUC__
 	return 0;
-//#endif
+#endif
 }
 #endif

From e8cf4cdaac49f81adc420cf25e1db0a8ec4ef556 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 00:33:11 -0500
Subject: [PATCH 37/56] SDL2: compile SDL with SDL_main for Win32

---
 src/sdl/i_main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index d3f94f13..c157a6be 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -55,6 +55,10 @@ PSP_MAIN_THREAD_STACK_SIZE_KB(256);
 #include "i_ttf.h"
 #endif
 
+#if defined (_WIN32) && !defined (main)
+#define SDLMAIN
+#endif
+
 #ifdef SDLMAIN
 #include "SDL_main.h"
 #elif defined(FORCESDLMAIN)
@@ -132,7 +136,6 @@ static inline VOID MakeCodeWritable(VOID)
 
 	\return	int
 */
-FUNCNORETURN
 #if defined (_XBOX) && defined (__GNUC__)
 void XBoxStartup()
 {

From b5af756c22e2c74daead4fb81c18bfb0a1be1f95 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 00:53:34 -0500
Subject: [PATCH 38/56] appveyor: let stop build the whole mess

---
 appveyor.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a9dae4fb..b589bc20 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,22 +36,22 @@ before_build:
 - mingw32-make --version
 
 build_script:
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1 clean
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 NOMIXER=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 NOMIXER=1
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 NOMIXER=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 NOMIXER=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 NOMIXER=1
+#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 NOMIXER=1
 
 
 on_finish:

From 0728bc6de28771014d815e95b3bbe3d82a1d5f60 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 00:58:40 -0500
Subject: [PATCH 39/56] appveyor: errormode for all

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

diff --git a/appveyor.yml b/appveyor.yml
index b589bc20..43275c8b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,9 +36,9 @@ before_build:
 - mingw32-make --version
 
 build_script:
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1 cleandep >nul|| exit 0
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean

From c7503b35b83bb9daa63758161d8b63ffffcb2462 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 01:05:41 -0500
Subject: [PATCH 40/56] appveyor: need to see what the depend step is not
 working

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

diff --git a/appveyor.yml b/appveyor.yml
index 43275c8b..41f5fb3d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ before_build:
 - mingw32-make --version
 
 build_script:
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1 cleandep >nul|| exit 0
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1 clean
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1

From 13866a5b7ec0b2a02126aff7fa48643d092dcbc7 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 01:23:26 -0500
Subject: [PATCH 41/56] appveyor: fixup SDL2_MIXER_MOVE

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

diff --git a/appveyor.yml b/appveyor.yml
index 41f5fb3d..cd09e2c8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
  SDL2_MOVE: SDL2-2.0.4\i686-w64-mingw32
  SDL2_MIXER_URL: https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.1-mingw.tar.gz
  SDL2_MIXER_ARCHIVE: SDL2_mixer-devel-2.0.1-mingw.tar
- SDL2_MIXER_MOVE: SDL2_mixer-2.0.1/i686-w64-mingw32
+ SDL2_MIXER_MOVE: SDL2_mixer-2.0.1\i686-w64-mingw32
 
 install:
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
@@ -23,6 +23,7 @@ install:
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
 - 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_MIXER_ARCHIVE%" -o%TMP% >null
+
 #- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config"))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config")
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake")) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake")

From f30dae216274e82efddc4151f930a169697e7a52 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 01:33:37 -0500
Subject: [PATCH 42/56] appveyor: need a copy of sed

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

diff --git a/appveyor.yml b/appveyor.yml
index cd09e2c8..054dc0cc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,15 +23,15 @@ install:
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
 - 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_MIXER_ARCHIVE%" -o%TMP% >null
-
-#- robocopy /S /xx /ns /nc /nfl /ndl /np %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
+#- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MOVE% %MINGW_SDK% | exit 0
+#- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MIXER_MOVE% %MINGW_SDK% || exit 0
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config"))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config")
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake")) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake")
 #- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc"))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
 
 before_build:
-- set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
-- set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
+#- set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
+#- set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
 - set Path=%MINGW_SDK%\bin;%Path%
 - i686-w64-mingw32-gcc --version
 - mingw32-make --version
@@ -57,5 +57,5 @@ build_script:
 
 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 ca34268a13e9a3157a2f0159923c1274067bf2dd Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 01:52:55 -0500
Subject: [PATCH 43/56] appveyor: let instal the SDL2 and SDL2_mixer to the
 Mingw toolchain

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

diff --git a/appveyor.yml b/appveyor.yml
index 054dc0cc..9f46a8b2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,15 +23,15 @@ install:
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
 - 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_MIXER_ARCHIVE%" -o%TMP% >null
-#- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MOVE% %MINGW_SDK% | exit 0
-#- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MIXER_MOVE% %MINGW_SDK% || exit 0
-#- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config"))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config")
-#- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake")) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake")
-#- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc"))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
+- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
+- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MIXER_MOVE% %MINGW_SDK% || exit 0
+- ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config")))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config"))
+- ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake"))) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake"))
+- ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc")))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc"))
+- ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MIXER_MOVE%\lib\pkgconfig\SDL2_mixer.pc")))| ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\SDL2_mixer.pc"))
 
 before_build:
-#- set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
-#- set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib  -lmingw32 -lSDL2main -lSDL2  -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
+- set SDL_PKGCONFIG=sdl2.pc
 - set Path=%MINGW_SDK%\bin;%Path%
 - i686-w64-mingw32-gcc --version
 - mingw32-make --version
@@ -57,5 +57,5 @@ build_script:
 
 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 0e483fc17b09dfca77941e41d248cd96b9ea910d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 01:55:39 -0500
Subject: [PATCH 44/56] appveyor: or not?

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

diff --git a/appveyor.yml b/appveyor.yml
index 9f46a8b2..d3747af9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,7 +31,7 @@ install:
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MIXER_MOVE%\lib\pkgconfig\SDL2_mixer.pc")))| ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\SDL2_mixer.pc"))
 
 before_build:
-- set SDL_PKGCONFIG=sdl2.pc
+- set SDL_PKGCONFIG=%MINGW_SDK%\lib\pkgconfig\sdl2.pc
 - set Path=%MINGW_SDK%\bin;%Path%
 - i686-w64-mingw32-gcc --version
 - mingw32-make --version
@@ -57,5 +57,4 @@ build_script:
 
 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 62702edebe4e42105f066c542b348076538a2e4b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 01:57:57 -0500
Subject: [PATCH 45/56] appveyor: I hope I do not need to debug this build xml
 again

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

diff --git a/appveyor.yml b/appveyor.yml
index d3747af9..85879443 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,16 +18,17 @@ environment:
 
 install:
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
-- if not exist "%SDL2_MIXER_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_MIXER_URL%" -FileName "%SDL2_MIXER_ARCHIVE%.gz"
 - 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
-- 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
-- 7z x -y "%TMP%\%SDL2_MIXER_ARCHIVE%" -o%TMP% >null
 - robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MOVE% %MINGW_SDK% || exit 0
-- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MIXER_MOVE% %MINGW_SDK% || exit 0
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config")))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config"))
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake"))) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake"))
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc")))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc"))
+
+- if not exist "%SDL2_MIXER_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_MIXER_URL%" -FileName "%SDL2_MIXER_ARCHIVE%.gz"
+- 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
+- 7z x -y "%TMP%\%SDL2_MIXER_ARCHIVE%" -o%TMP% >null
+- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\%SDL2_MIXER_MOVE% %MINGW_SDK% || exit 0
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MIXER_MOVE%\lib\pkgconfig\SDL2_mixer.pc")))| ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\SDL2_mixer.pc"))
 
 before_build:
@@ -37,7 +38,7 @@ before_build:
 - mingw32-make --version
 
 build_script:
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ECHO=1 clean
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 #- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
@@ -57,4 +58,4 @@ build_script:
 
 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 94d36fbe5bf017663d048504661f2bba0e0f817c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 02:07:36 -0500
Subject: [PATCH 46/56] apveyor: no debug dump

---
 appveyor.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 85879443..cfc9edf3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,21 +39,7 @@ before_build:
 
 build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 clean
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOMIXER=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 DEBUGMODE=1 NOMIXER=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 clean
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 clean
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 NOMIXER=1
-#- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOHW=1 DEBUGMODE=1 NOMIXER=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOOBJDUMP=1 ERRORMODE=1
 
 
 on_finish:

From d7925104b95a196aa14a6b1e7c3218fd4a87bb55 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 11:09:46 -0500
Subject: [PATCH 47/56] appveyor: push build to FTP server

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

diff --git a/appveyor.yml b/appveyor.yml
index cfc9edf3..74add414 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,10 +1,6 @@
 version: 2.1.14.{branch}-{build}
 os: MinGW
 
-cache:
-- SDL2-devel-2.0.4-mingw.tar.gz
-- SDL2_mixer-devel-2.0.1-mingw.tar.gz
- 
 environment:
  CC: i686-w64-mingw32-gcc
  WINDRES: windres
@@ -16,7 +12,12 @@ environment:
  SDL2_MIXER_ARCHIVE: SDL2_mixer-devel-2.0.1-mingw.tar
  SDL2_MIXER_MOVE: SDL2_mixer-2.0.1\i686-w64-mingw32
 
+cache:
+- SDL2-devel-2.0.4-mingw.tar.gz
+- SDL2_mixer-devel-2.0.1-mingw.tar.gz
+
 install:
+#Download SDL2
 - if not exist "%SDL2_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_URL%" -FileName "%SDL2_ARCHIVE%.gz"
 - 7z x -y "%SDL2_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_ARCHIVE%" -o%TMP% >null
@@ -24,7 +25,7 @@ install:
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\bin\sdl2-config")))                  | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\bin\sdl2-config"))
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\cmake\SDL2\sdl2-config.cmake"))) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\cmake\SDL2\sdl2-config.cmake"))
 - ps: (Get-Content ([System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc")))            | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%")) } | Set-Content ([System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc"))
-
+#Download SDL2_Mixer
 - if not exist "%SDL2_MIXER_ARCHIVE%.gz" appveyor DownloadFile "%SDL2_MIXER_URL%" -FileName "%SDL2_MIXER_ARCHIVE%.gz"
 - 7z x -y "%SDL2_MIXER_ARCHIVE%.gz" -o%TMP% >null
 - 7z x -y "%TMP%\%SDL2_MIXER_ARCHIVE%" -o%TMP% >null
@@ -39,7 +40,25 @@ before_build:
 
 build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
-- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 NOOBJDUMP=1 ERRORMODE=1
+- cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
+
+test: off
+
+artifacts:
+ - path: bin\Mingw\$(configuration)
+
+deploy:
+  - provider: FTP
+    protocol: ftps
+    host: 
+      secure: NsLJEPIBvmwCOj8Tg8RoRQ==
+    username:
+      secure: z/r81kkL3Mm6wxjuN0sW1w==
+    password:
+      secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
+    folder:
+    application:
+    active_mode: false
 
 
 on_finish:

From 4b8167d823ed180af310d3db05e0733fe5a200cb Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 11:27:33 -0500
Subject: [PATCH 48/56] appveyor: let push a 7z in the after build step

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

diff --git a/appveyor.yml b/appveyor.yml
index 74add414..ad0ca9e1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -42,10 +42,11 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 clean
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
-test: off
+after_build:
+- cmd: 7z a Build.7z -w bin\Mingw\Release
+- appveyor PushArtifact Build.7z
 
-artifacts:
- - path: bin\Mingw\$(configuration)
+test: off
 
 deploy:
   - provider: FTP

From 5582d715d49e340512b19ce5fcfba4e8496820cf Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 11:39:16 -0500
Subject: [PATCH 49/56] appveyor: let have the build bot have the right
 username

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

diff --git a/appveyor.yml b/appveyor.yml
index ad0ca9e1..a2608248 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,7 +54,7 @@ deploy:
     host: 
       secure: NsLJEPIBvmwCOj8Tg8RoRQ==
     username:
-      secure: z/r81kkL3Mm6wxjuN0sW1w==
+      secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
     password:
       secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
     folder:

From ba1cb80ff7b610bcb5c12ae34f1eefad2d8d13da Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 11:42:40 -0500
Subject: [PATCH 50/56] appveyor: name each 7z by version"

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

diff --git a/appveyor.yml b/appveyor.yml
index a2608248..09ea7cec 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,8 +43,8 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
 after_build:
-- cmd: 7z a Build.7z -w bin\Mingw\Release
-- appveyor PushArtifact Build.7z
+- cmd: 7z a $(appveyor_build_version).7z bin\Mingw\Release -x!.gitignore
+- appveyor PushArtifact $(appveyor_build_version).7z
 
 test: off
 

From 343c8a949857bb20d5cffb7f012688dae374cced Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 11:55:00 -0500
Subject: [PATCH 51/56] appveyor: or not, let try this naming

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

diff --git a/appveyor.yml b/appveyor.yml
index 09ea7cec..7105a64b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,8 +43,8 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
 after_build:
-- cmd: 7z a $(appveyor_build_version).7z bin\Mingw\Release -x!.gitignore
-- appveyor PushArtifact $(appveyor_build_version).7z
+- cmd: 7z a Build-{build}.7z bin\Mingw\Release -x!.gitignore
+- appveyor PushArtifact Build-{build}.7z
 
 test: off
 
@@ -57,7 +57,7 @@ deploy:
       secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
     password:
       secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
-    folder:
+    folder: {branch}
     application:
     active_mode: false
 

From 38952028612041228141f511c75489de012ba04a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 12:00:05 -0500
Subject: [PATCH 52/56] appveyor: let include the commit id

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

diff --git a/appveyor.yml b/appveyor.yml
index 7105a64b..2f35afad 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,8 +43,8 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
 after_build:
-- cmd: 7z a Build-{build}.7z bin\Mingw\Release -x!.gitignore
-- appveyor PushArtifact Build-{build}.7z
+- cmd: 7z a %APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z bin\Mingw\Release -x!.gitignore
+- appveyor PushArtifact %APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z
 
 test: off
 
@@ -57,7 +57,7 @@ deploy:
       secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
     password:
       secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
-    folder: {branch}
+    folder: appveyor
     application:
     active_mode: false
 

From 01f2f4d444f0276e9c62991dd24e962043e2de31 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 12:08:41 -0500
Subject: [PATCH 53/56] appveyor: move naming of 7z to env block

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

diff --git a/appveyor.yml b/appveyor.yml
index 2f35afad..581c628f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,6 +11,7 @@ environment:
  SDL2_MIXER_URL: https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.1-mingw.tar.gz
  SDL2_MIXER_ARCHIVE: SDL2_mixer-devel-2.0.1-mingw.tar
  SDL2_MIXER_MOVE: SDL2_mixer-2.0.1\i686-w64-mingw32
+ BUILD_ARCHIVE: %APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z
 
 cache:
 - SDL2-devel-2.0.4-mingw.tar.gz
@@ -43,8 +44,8 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
 after_build:
-- cmd: 7z a %APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z bin\Mingw\Release -x!.gitignore
-- appveyor PushArtifact %APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z
+- cmd: 7z a %BUILD_ARCHIVE% bin\Mingw\Release -x!.gitignore
+- appveyor PushArtifact %BUILD_ARCHIVE%
 
 test: off
 

From b3ee8591f2e3afd6a67594706207eddca1066ada Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 12:36:48 -0500
Subject: [PATCH 54/56] appveyor: ok, let set the var in after build step

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

diff --git a/appveyor.yml b/appveyor.yml
index 581c628f..bd695fde 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,6 @@ environment:
  SDL2_MIXER_URL: https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.1-mingw.tar.gz
  SDL2_MIXER_ARCHIVE: SDL2_mixer-devel-2.0.1-mingw.tar
  SDL2_MIXER_MOVE: SDL2_mixer-2.0.1\i686-w64-mingw32
- BUILD_ARCHIVE: %APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z
 
 cache:
 - SDL2-devel-2.0.4-mingw.tar.gz
@@ -44,6 +43,7 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
 after_build:
+- set BUILD_ARCHIVE=%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7
 - cmd: 7z a %BUILD_ARCHIVE% bin\Mingw\Release -x!.gitignore
 - appveyor PushArtifact %BUILD_ARCHIVE%
 

From 0f83c2aeb521f1d2fc0cffe289d14c49379535f1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 12:53:39 -0500
Subject: [PATCH 55/56] appveyor: 7z, not 7

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

diff --git a/appveyor.yml b/appveyor.yml
index bd695fde..adc57d48 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,7 +43,7 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
 after_build:
-- set BUILD_ARCHIVE=%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7
+- set BUILD_ARCHIVE=%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z
 - cmd: 7z a %BUILD_ARCHIVE% bin\Mingw\Release -x!.gitignore
 - appveyor PushArtifact %BUILD_ARCHIVE%
 

From deca16f923a0cd801c32b59e1d977906e66ad876 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 29 Jan 2016 18:38:41 -0500
Subject: [PATCH 56/56] appveyor: let use short commits

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

diff --git a/appveyor.yml b/appveyor.yml
index adc57d48..70f18666 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,8 +43,10 @@ build_script:
 - cmd: mingw32-make.exe -C src MINGW=1 WARNINGMODE=1 NOASM=1 NOUPX=1 GCC52=1 SDL=1 ERRORMODE=1
 
 after_build:
-- set BUILD_ARCHIVE=%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%.7z
-- cmd: 7z a %BUILD_ARCHIVE% bin\Mingw\Release -x!.gitignore
+- cmd: git rev-parse --short %APPVEYOR_REPO_COMMIT%>%TMP%/gitshort.txt
+- cmd: set /P GITSHORT=<%TMP%/gitshort.txt
+- set BUILD_ARCHIVE=%APPVEYOR_REPO_BRANCH%-%GITSHORT%.7z
+- cmd: 7z a %BUILD_ARCHIVE% bin\Mingw\Release -xr!.gitignore
 - appveyor PushArtifact %BUILD_ARCHIVE%
 
 test: off