From 56bd0d9ab95a3962b2258aee7d8b7d227b5dfd00 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 01:20:15 +0900
Subject: [PATCH 01/35] add very basic travis.yaml

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..d474b66912
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: c
+notifications:
+  irc: "irc.freenode.net#openrct2"

From 48195e98467eb4921bf6956b0154dd1a5b625997 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 01:51:09 +0900
Subject: [PATCH 02/35] dont use configure

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

diff --git a/.travis.yml b/.travis.yml
index d474b66912..e82d0ecae7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: c
+install:
+    - echo "Hello World"
 notifications:
   irc: "irc.freenode.net#openrct2"

From 37d108dd62a8496d6237baff94ff6d3aa8e2888a Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 01:56:37 +0900
Subject: [PATCH 03/35] change script. disable IRC notification for now

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

diff --git a/.travis.yml b/.travis.yml
index e82d0ecae7..d2470ede8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: c
-install:
+script:
     - echo "Hello World"
-notifications:
-  irc: "irc.freenode.net#openrct2"
+#notifications:
+  #irc: "irc.freenode.net#openrct2"

From 799e4705f1e9b86e37fe7759fca4244f20ade9b5 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 02:16:51 +0900
Subject: [PATCH 04/35] install mingw on travis

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

diff --git a/.travis.yml b/.travis.yml
index d2470ede8c..b6e974b7d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: c
+before_install:
+    - sudo apt-get install  mingw32
 script:
     - echo "Hello World"
 #notifications:

From 1fd54f87a53b26f80436fcb83059504b6ba690f9 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:09:22 +0900
Subject: [PATCH 05/35] try cmake

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b6e974b7d3..1469988208 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,10 @@
 language: c
 before_install:
-    - sudo apt-get install  mingw32
+    - sudo apt-get install mingw32
 script:
+    - which crossdev
     - echo "Hello World"
+    - mkdir build
+    - pushd build; cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug .. ; popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"

From 3b74bc8feb1247c61499fdac271647c27db6059d Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:15:28 +0900
Subject: [PATCH 06/35] try installing libsdl2

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

diff --git a/.travis.yml b/.travis.yml
index 1469988208..0a7ff0147a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: c
 before_install:
-    - sudo apt-get install mingw32
+    - sudo apt-get install mingw32 libsdl2-static-dev
 script:
     - which crossdev
     - echo "Hello World"

From c17117329bae500ce85b3e26fe8fafee30fc8c68 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:18:43 +0900
Subject: [PATCH 07/35] add some more yum repos

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

diff --git a/.travis.yml b/.travis.yml
index 0a7ff0147a..1f1e6b7898 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: c
 before_install:
+    - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
+    - echo "yes" | sudo apt-add-repository ppa:openmw/deps
+    - sudo apt-get update -qq
     - sudo apt-get install mingw32 libsdl2-static-dev
 script:
     - which crossdev

From 666ae9538d33716005562581f74ea5f2e933767a Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:20:42 +0900
Subject: [PATCH 08/35] qq must mean yes

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

diff --git a/.travis.yml b/.travis.yml
index 1f1e6b7898..fcc971b21b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ before_install:
     - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
     - sudo apt-get update -qq
-    - sudo apt-get install mingw32 libsdl2-static-dev
+    - sudo apt-get install -qq mingw32 libsdl2-static-dev
 script:
     - which crossdev
     - echo "Hello World"

From 1c777a653f5f43bea50cdf822f47b2ad6b70725b Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:25:26 +0900
Subject: [PATCH 09/35] try updating keys as well

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

diff --git a/.travis.yml b/.travis.yml
index fcc971b21b..e4118063f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: c
 before_install:
     - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
+    - sudo apt-key update -qq
     - sudo apt-get update -qq
     - sudo apt-get install -qq mingw32 libsdl2-static-dev
 script:

From cbf2897526658f81a7f954051bff04c1101dbf17 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:26:05 +0900
Subject: [PATCH 10/35] force yes

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

diff --git a/.travis.yml b/.travis.yml
index e4118063f6..ac236afca1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ before_install:
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
     - sudo apt-key update -qq
     - sudo apt-get update -qq
-    - sudo apt-get install -qq mingw32 libsdl2-static-dev
+    - sudo apt-get install -y --force-yes mingw32 libsdl2-static-dev
 script:
     - which crossdev
     - echo "Hello World"

From d2198a11b999092d805236010b9349b53cb2b4c0 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:29:02 +0900
Subject: [PATCH 11/35] install mingw related stuff

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

diff --git a/.travis.yml b/.travis.yml
index ac236afca1..3e152dead8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ before_install:
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
     - sudo apt-key update -qq
     - sudo apt-get update -qq
+    - sudo apt-get install -y --force-yes  binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
     - sudo apt-get install -y --force-yes mingw32 libsdl2-static-dev
 script:
     - which crossdev

From df93c872d2796986889e49bc87db5079d1bb9b31 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:36:10 +0900
Subject: [PATCH 12/35] show what we have in usr bin

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

diff --git a/.travis.yml b/.travis.yml
index 3e152dead8..4a02da76be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -y --force-yes  binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
     - sudo apt-get install -y --force-yes mingw32 libsdl2-static-dev
+    - ls -al /usr/bin
+    - ls -al /usr/include/SDL2
 script:
     - which crossdev
     - echo "Hello World"

From 885a3cf932f5af75dd9809f71ebdcf43383af4d4 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:41:24 +0900
Subject: [PATCH 13/35] try adding another package

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

diff --git a/.travis.yml b/.travis.yml
index 4a02da76be..13b78ce34e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ before_install:
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
     - sudo apt-key update -qq
     - sudo apt-get update -qq
-    - sudo apt-get install -y --force-yes  binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
+    - sudo apt-get install -y --force-yes gcc-mingw32 binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
     - sudo apt-get install -y --force-yes mingw32 libsdl2-static-dev
     - ls -al /usr/bin
     - ls -al /usr/include/SDL2

From 71cb38b15556ae42f9fc87855c3679568546a418 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:44:00 +0900
Subject: [PATCH 14/35] another package'

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

diff --git a/.travis.yml b/.travis.yml
index 13b78ce34e..d71f262930 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
     - sudo apt-key update -qq
     - sudo apt-get update -qq
     - sudo apt-get install -y --force-yes gcc-mingw32 binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
-    - sudo apt-get install -y --force-yes mingw32 libsdl2-static-dev
+    - sudo apt-get install -y --force-yes mingw32-binutils mingw32 libsdl2-static-dev
     - ls -al /usr/bin
     - ls -al /usr/include/SDL2
 script:

From 3d5c4df3d88d52cff0986a34b83ef42eb407dea1 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:56:11 +0900
Subject: [PATCH 15/35] remove some packages

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

diff --git a/.travis.yml b/.travis.yml
index d71f262930..0de1670b2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,11 @@ before_install:
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
     - sudo apt-key update -qq
     - sudo apt-get update -qq
-    - sudo apt-get install -y --force-yes gcc-mingw32 binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
-    - sudo apt-get install -y --force-yes mingw32-binutils mingw32 libsdl2-static-dev
+    - sudo apt-get install -y --force-yes 
+    - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev
     - ls -al /usr/bin
+    - cp /usr/bin/i586-mingw32msvc-gcc /usr/bin/i686-mingw32msvc-gcc
+      i586-mingw32msvc-c++
     - ls -al /usr/include/SDL2
 script:
     - which crossdev

From 0635567dccdfec00e88551efed276afe353ad846 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:56:20 +0900
Subject: [PATCH 16/35] doh

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

diff --git a/.travis.yml b/.travis.yml
index 0de1670b2b..833cca523e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ before_install:
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
     - sudo apt-key update -qq
     - sudo apt-get update -qq
-    - sudo apt-get install -y --force-yes 
     - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev
     - ls -al /usr/bin
     - cp /usr/bin/i586-mingw32msvc-gcc /usr/bin/i686-mingw32msvc-gcc

From 1f09b20a1240b34d6c644a8f58ae4ed5caa677f3 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 11:58:58 +0900
Subject: [PATCH 17/35] remove thing that isnt needed

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

diff --git a/.travis.yml b/.travis.yml
index 833cca523e..92c987f100 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev
     - ls -al /usr/bin
-    - cp /usr/bin/i586-mingw32msvc-gcc /usr/bin/i686-mingw32msvc-gcc
-      i586-mingw32msvc-c++
     - ls -al /usr/include/SDL2
 script:
     - which crossdev

From 107937768e144aa9452eb36f778a1f5c624b4c9a Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:04:04 +0900
Subject: [PATCH 18/35] add include path

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

diff --git a/.travis.yml b/.travis.yml
index 92c987f100..9191bad4d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,6 @@ script:
     - which crossdev
     - echo "Hello World"
     - mkdir build
-    - pushd build; cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug .. ; popd
+    - pushd build; cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug -DEO_SOURCE_DIR:PATH=/usr/include/SDL2 .. ; popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"

From 5ef8cd4f609231709d5ac5f06b13cd66a630c733 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:08:33 +0900
Subject: [PATCH 19/35] add sdl include dir

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

diff --git a/.travis.yml b/.travis.yml
index 9191bad4d7..939a1192e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,8 @@ before_install:
     - ls -al /usr/bin
     - ls -al /usr/include/SDL2
 script:
-    - which crossdev
     - echo "Hello World"
     - mkdir build
-    - pushd build; cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug -DEO_SOURCE_DIR:PATH=/usr/include/SDL2 .. ; popd
+    - pushd build; SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. ; popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"

From 5fc0b75414f277efbf68ff15ef957962d04b9deb Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:13:50 +0900
Subject: [PATCH 20/35] try capitalization tricks

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

diff --git a/.travis.yml b/.travis.yml
index 939a1192e1..e46935ad45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ before_install:
     - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev
     - ls -al /usr/bin
     - ls -al /usr/include/SDL2
+    - mv /usr/include/SDL2 /usr/include/sdl2
+    - find / -name SDL2
 script:
     - echo "Hello World"
     - mkdir build

From 80a74ae27d9378ce4f292cd64b4668d72b64ec5b Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:16:52 +0900
Subject: [PATCH 21/35] move it

---
 .travis.yml          | 2 +-
 CMakeLists_mingw.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e46935ad45..7e2618cb46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
     - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev
     - ls -al /usr/bin
     - ls -al /usr/include/SDL2
-    - mv /usr/include/SDL2 /usr/include/sdl2
+    - sudo mv /usr/include/SDL2 /usr/include/sdl2
     - find / -name SDL2
 script:
     - echo "Hello World"
diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt
index 111ad06a48..2a6991bf95 100644
--- a/CMakeLists_mingw.txt
+++ b/CMakeLists_mingw.txt
@@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
 SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})
 
 # adjust the default behaviour of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search 
+# search headers and libraries in the target environment, search
 # programs in the host environment
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)

From de9d491155daef5d02d921f30712a5522c337aad Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:19:41 +0900
Subject: [PATCH 22/35] sudo it harden it

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

diff --git a/.travis.yml b/.travis.yml
index 7e2618cb46..0f671cd4bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ before_install:
     - ls -al /usr/bin
     - ls -al /usr/include/SDL2
     - sudo mv /usr/include/SDL2 /usr/include/sdl2
-    - find / -name SDL2
 script:
+    - sudo find / -name SDL2 2>>/dev/null || true
     - echo "Hello World"
     - mkdir build
     - pushd build; SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. ; popd

From 79b1f7131792eac6467994d9e70af28fd031e9b4 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:24:57 +0900
Subject: [PATCH 23/35] just hardcode it

---
 .travis.yml          | 2 +-
 CMakeLists_mingw.txt | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0f671cd4bf..43d9b7428c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,6 @@ script:
     - sudo find / -name SDL2 2>>/dev/null || true
     - echo "Hello World"
     - mkdir build
-    - pushd build; SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. ; popd
+    - pushd build && SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"
diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt
index 2a6991bf95..cb8efc8f9c 100644
--- a/CMakeLists_mingw.txt
+++ b/CMakeLists_mingw.txt
@@ -16,9 +16,9 @@ set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc" CACHE STRING "" FORCE)
 include_directories("/usr/include/wine/windows/")
 
 # find and include SDL2
-INCLUDE(FindPkgConfig)
-PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
-INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
+# INCLUDE(FindPkgConfig)
+# PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
+INCLUDE_DIRECTORIES("/usr/include/sdl2")
 
 # here is the target environment located
 SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})

From 6f800ba98cd6d1b7af7d729da8157b645c90ac0a Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:28:26 +0900
Subject: [PATCH 24/35] introduce syntax error

---
 .travis.yml  | 1 -
 src/editor.c | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 43d9b7428c..adca770c44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ before_install:
     - sudo mv /usr/include/SDL2 /usr/include/sdl2
 script:
     - sudo find / -name SDL2 2>>/dev/null || true
-    - echo "Hello World"
     - mkdir build
     - pushd build && SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
 #notifications:
diff --git a/src/editor.c b/src/editor.c
index b1aac65f76..5cb0db901c 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -35,6 +35,8 @@
 
 static void set_all_land_owned();
 
+Syntax error blah blah blat *&2)
+
 /**
  *
  *  rct2: 0x0066FFE1
@@ -184,4 +186,4 @@ void sub_6BD3A4() {
 		RCT2_ADDRESS(0x013CA672, uint8)[i] = 1;
 	}
 	RCT2_CALLPROC_EBPSAFE(0x006C0C3F);
-}
\ No newline at end of file
+}

From f68bd7013b3b5b2d336751da5bdb262a911e4769 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:31:10 +0900
Subject: [PATCH 25/35] oops. need to actually make it

---
 .travis.yml  | 1 +
 src/editor.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index adca770c44..86758a86f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,5 +12,6 @@ script:
     - sudo find / -name SDL2 2>>/dev/null || true
     - mkdir build
     - pushd build && SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
+    - pushd build && make
 #notifications:
   #irc: "irc.freenode.net#openrct2"
diff --git a/src/editor.c b/src/editor.c
index 5cb0db901c..8c604bc726 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -35,7 +35,7 @@
 
 static void set_all_land_owned();
 
-Syntax error blah blah blat *&2)
+/*Syntax error blah blah blat *&2)*/
 
 /**
  *

From 48f9acad4251d702e8cfe472855057978df5c7f8 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:33:34 +0900
Subject: [PATCH 26/35] find iconv.h

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

diff --git a/.travis.yml b/.travis.yml
index 86758a86f4..4a6aa03027 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ script:
     - sudo find / -name SDL2 2>>/dev/null || true
     - mkdir build
     - pushd build && SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
-    - pushd build && make
+    - sudo find / -name iconv.h 2>>/dev/null || true
+    - pushd build && make && popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"

From 61a602eddeb01e7cc3b05bd892730b32e3930f7f Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:36:10 +0900
Subject: [PATCH 27/35] try the dumbest thing possible

---
 CMakeLists_mingw.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt
index cb8efc8f9c..b67f40f803 100644
--- a/CMakeLists_mingw.txt
+++ b/CMakeLists_mingw.txt
@@ -19,6 +19,7 @@ include_directories("/usr/include/wine/windows/")
 # INCLUDE(FindPkgConfig)
 # PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
 INCLUDE_DIRECTORIES("/usr/include/sdl2")
+INCLUDE_DIRECTORIES("/usr/include")
 
 # here is the target environment located
 SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})

From 242c40d5ff537a17236f9bf8755a10f6b8c0c27a Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:39:00 +0900
Subject: [PATCH 28/35] change ordering

---
 .travis.yml          | 2 +-
 CMakeLists_mingw.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a6aa03027..9b597f1357 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
 script:
     - sudo find / -name SDL2 2>>/dev/null || true
     - mkdir build
-    - pushd build && SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
+    - pushd build && cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
     - sudo find / -name iconv.h 2>>/dev/null || true
     - pushd build && make && popd
 #notifications:
diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt
index b67f40f803..29decbe917 100644
--- a/CMakeLists_mingw.txt
+++ b/CMakeLists_mingw.txt
@@ -18,8 +18,8 @@ include_directories("/usr/include/wine/windows/")
 # find and include SDL2
 # INCLUDE(FindPkgConfig)
 # PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
-INCLUDE_DIRECTORIES("/usr/include/sdl2")
 INCLUDE_DIRECTORIES("/usr/include")
+INCLUDE_DIRECTORIES("/usr/include/sdl2")
 
 # here is the target environment located
 SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})

From ce85716eafd5f7e95adbe2f1a1f6e8f504d34165 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:42:24 +0900
Subject: [PATCH 29/35] find predefs.h

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

diff --git a/.travis.yml b/.travis.yml
index 9b597f1357..2197f73679 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ script:
     - mkdir build
     - pushd build && cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
     - sudo find / -name iconv.h 2>>/dev/null || true
+    - sudo find / -name predefs.h 2>>/dev/null || true
     - pushd build && make && popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"

From c2e313c52d553c91250c88c34a779993a1ce1d00 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:44:49 +0900
Subject: [PATCH 30/35] add bits directory

---
 CMakeLists_mingw.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt
index 29decbe917..bfa9a19885 100644
--- a/CMakeLists_mingw.txt
+++ b/CMakeLists_mingw.txt
@@ -19,6 +19,7 @@ include_directories("/usr/include/wine/windows/")
 # INCLUDE(FindPkgConfig)
 # PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
 INCLUDE_DIRECTORIES("/usr/include")
+INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu/bits")
 INCLUDE_DIRECTORIES("/usr/include/sdl2")
 
 # here is the target environment located

From 0b0ea74706c59efd43437691234432d4de158b92 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:48:32 +0900
Subject: [PATCH 31/35] try adding C include path

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

diff --git a/.travis.yml b/.travis.yml
index 2197f73679..3d57916d7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,6 @@ script:
     - pushd build && cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
     - sudo find / -name iconv.h 2>>/dev/null || true
     - sudo find / -name predefs.h 2>>/dev/null || true
-    - pushd build && make && popd
+    - pushd build && C_INCLUDE_PATH=/usr/include/x86_64-linux-gnu/bits:/usr/include/sdl2:$C_INCLUDE_PATH make && popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"

From 40c591a54127e2201e9813d08a2dbfce33ce17ff Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:51:41 +0900
Subject: [PATCH 32/35] try adding it in other place

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ac432ad6a..55a4fb06e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,9 @@ if (UNIX)
 	# find and include SDL2
 	INCLUDE(FindPkgConfig)
 	PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
+    INCLUDE_DIRECTORIES("/usr/include")
 	INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
+    INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu/bits")
 	TARGET_LINK_LIBRARIES(${PROJECT} ${SDL2_LIBRARIES})
 endif (UNIX)
 

From fb635e50694e95ed4369f44b5f3456f1e2783d97 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:54:12 +0900
Subject: [PATCH 33/35] dont use bits folder

---
 CMakeLists.txt       | 2 --
 CMakeLists_mingw.txt | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55a4fb06e2..1ac432ad6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,9 +46,7 @@ if (UNIX)
 	# find and include SDL2
 	INCLUDE(FindPkgConfig)
 	PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
-    INCLUDE_DIRECTORIES("/usr/include")
 	INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
-    INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu/bits")
 	TARGET_LINK_LIBRARIES(${PROJECT} ${SDL2_LIBRARIES})
 endif (UNIX)
 
diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt
index bfa9a19885..1f92220945 100644
--- a/CMakeLists_mingw.txt
+++ b/CMakeLists_mingw.txt
@@ -19,7 +19,7 @@ include_directories("/usr/include/wine/windows/")
 # INCLUDE(FindPkgConfig)
 # PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
 INCLUDE_DIRECTORIES("/usr/include")
-INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu/bits")
+INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu")
 INCLUDE_DIRECTORIES("/usr/include/sdl2")
 
 # here is the target environment located

From ff63c8d1feae54db9154aa803eb913f222f71c15 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 12:57:02 +0900
Subject: [PATCH 34/35] find stubs-32.h

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

diff --git a/.travis.yml b/.travis.yml
index 3d57916d7b..9de7ffae6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,7 @@ script:
     - sudo find / -name SDL2 2>>/dev/null || true
     - mkdir build
     - pushd build && cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug  .. && popd
-    - sudo find / -name iconv.h 2>>/dev/null || true
-    - sudo find / -name predefs.h 2>>/dev/null || true
+    - sudo find / -name stubs-32.h 2>>/dev/null || true
     - pushd build && C_INCLUDE_PATH=/usr/include/x86_64-linux-gnu/bits:/usr/include/sdl2:$C_INCLUDE_PATH make && popd
 #notifications:
   #irc: "irc.freenode.net#openrct2"

From ed61037bfb2b154df7a38be7ed7bc163fcba0b5b Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Sat, 24 May 2014 13:01:34 +0900
Subject: [PATCH 35/35] install extra package for stubs-32 deb

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

diff --git a/.travis.yml b/.travis.yml
index 9de7ffae6b..2685289d40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ before_install:
     - echo "yes" | sudo apt-add-repository ppa:openmw/deps
     - sudo apt-key update -qq
     - sudo apt-get update -qq
-    - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev
+    - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev libc6-dev-i386
     - ls -al /usr/bin
     - ls -al /usr/include/SDL2
     - sudo mv /usr/include/SDL2 /usr/include/sdl2