From a6fca35f3f408c50966647bf516c21a177754140 Mon Sep 17 00:00:00 2001
From: Jonathan Goldfarb <jgoldfar@gmail.com>
Date: Thu, 10 Jan 2019 09:39:54 -0500
Subject: [PATCH 1/3] Add Travis CI configuration. TODO: Setup releases

---
 .travis.yml | 39 +++++++++++++++++++++++++++++++++++++++
 README.md   |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..2d04516
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,39 @@
+language: cpp
+
+addons:
+  apt:
+    packages:
+      - libxrandr-dev
+      - libudev-dev
+      - libfreetype6-dev
+      - libopenal-dev
+      - libvorbis-dev
+      - libflac-dev
+      - libblas-dev
+
+compiler:
+  - clang
+  - gcc
+
+before_script:
+  - mkdir ${TRAVIS_BUILD_DIR}/deps && cd ${TRAVIS_BUILD_DIR}/deps
+  # Build Eigen
+  - wget http://bitbucket.org/eigen/eigen/get/3.3.7.tar.gz
+  - tar xvzf 3.3.7.tar.gz
+  - cd eigen-eigen-323c052e1731/
+  - mkdir build && cd build
+  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. && cmake -L ..
+  - make install
+  # Download/Build SFML
+  - cd ${TRAVIS_BUILD_DIR}/deps
+  - wget https://www.sfml-dev.org/files/SFML-2.5.1-sources.zip
+  - unzip SFML-2.5.1-sources.zip
+  - cd SFML-2.5.1
+  - mkdir build && cd build
+  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. && cmake -L ..
+  - make install
+
+script:
+  - mkdir -p ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
+  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr  -DCMAKE_CXX_FLAGS="-I${TRAVIS_BUILD_DIR}/usr/include -I${TRAVIS_BUILD_DIR}/usr/include/eigen3" .. && cmake -LA ..
+  - make
diff --git a/README.md b/README.md
index 1447b47..bcb4226 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Marble Marcher
 
+[![Build Status](https://travis-ci.org/jgoldfar/MarbleMarcher.svg?branch=master)](https://travis-ci.org/jgoldfar/MarbleMarcher)
+
 Marble Marcher is a video game demo that uses a fractal physics engine and fully procedural rendering to produce beautiful and unique gameplay unlike anything you've seen before.
 
 The goal of the game is to reach the flag as quickly as possible.  But be careful not to

From 8f9101342d681f183ab16825121a84e57c59f810 Mon Sep 17 00:00:00 2001
From: Jonathan Goldfarb <jgoldfar@gmail.com>
Date: Thu, 10 Jan 2019 12:39:39 -0500
Subject: [PATCH 2/3] Try turning on OSX CI

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

diff --git a/.travis.yml b/.travis.yml
index 2d04516..d934317 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: cpp
 
+os:
+  - linux
+  - osx
+
 addons:
   apt:
     packages:
@@ -10,6 +14,17 @@ addons:
       - libvorbis-dev
       - libflac-dev
       - libblas-dev
+  homebrew:
+    packages:
+      - flac
+      - libvorbis
+      - libogg
+      - freetype
+      - cmake
+      - openal-soft
+      - libsndfile
+      - jpeg
+      - glew
 
 compiler:
   - clang
@@ -22,7 +37,7 @@ before_script:
   - tar xvzf 3.3.7.tar.gz
   - cd eigen-eigen-323c052e1731/
   - mkdir build && cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. && cmake -L ..
+  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr ..
   - make install
   # Download/Build SFML
   - cd ${TRAVIS_BUILD_DIR}/deps
@@ -30,7 +45,13 @@ before_script:
   - unzip SFML-2.5.1-sources.zip
   - cd SFML-2.5.1
   - mkdir build && cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. && cmake -L ..
+  - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then
+      cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr -DSFML_INSTALL_XCODE_TEMPLATES=FALSE -DSFML_BUILD_FRAMEWORKS=FALSE -DBUILD_SHARED_LIBS=TRUE -DSFML_MISC_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr/share/SFML -DSFML_DEPENDENCIES_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. ;
+    fi
+  - if [ "${TRAVIS_OS_NAME}" == "linux" ] ; then
+      cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. ;
+    fi
+  - cmake -LA ..
   - make install
 
 script:

From debf9d8432257bf197b57904a15a6220ed85ae50 Mon Sep 17 00:00:00 2001
From: Jonathan Goldfarb <jgoldfar@gmail.com>
Date: Thu, 10 Jan 2019 15:15:58 -0500
Subject: [PATCH 3/3] Add packaging of necessary binary deps into a tarball

---
 .travis.yml | 65 ++++++++++++++++++++++++++++++++++++-----------------
 README.md   |  9 ++++++++
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d934317..4ecf5b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,24 +7,24 @@ os:
 addons:
   apt:
     packages:
-      - libxrandr-dev
-      - libudev-dev
-      - libfreetype6-dev
-      - libopenal-dev
-      - libvorbis-dev
-      - libflac-dev
-      - libblas-dev
+    - libxrandr-dev
+    - libudev-dev
+    - libfreetype6-dev
+    - libopenal-dev
+    - libvorbis-dev
+    - libflac-dev
+    - libblas-dev
   homebrew:
     packages:
-      - flac
-      - libvorbis
-      - libogg
-      - freetype
-      - cmake
-      - openal-soft
-      - libsndfile
-      - jpeg
-      - glew
+    - flac
+    - libvorbis
+    - libogg
+    - freetype
+    - cmake
+    - openal-soft
+    - libsndfile
+    - jpeg
+    - glew
 
 compiler:
   - clang
@@ -32,29 +32,52 @@ compiler:
 
 before_script:
   - mkdir ${TRAVIS_BUILD_DIR}/deps && cd ${TRAVIS_BUILD_DIR}/deps
-  # Build Eigen
+  # Eigen v3.3.7
   - wget http://bitbucket.org/eigen/eigen/get/3.3.7.tar.gz
   - tar xvzf 3.3.7.tar.gz
   - cd eigen-eigen-323c052e1731/
   - mkdir build && cd build
   - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr ..
+  # - cmake -LA ..
   - make install
-  # Download/Build SFML
   - cd ${TRAVIS_BUILD_DIR}/deps
+  # SFML v2.5.1
   - wget https://www.sfml-dev.org/files/SFML-2.5.1-sources.zip
   - unzip SFML-2.5.1-sources.zip
   - cd SFML-2.5.1
   - mkdir build && cd build
-  - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then
+  - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then 
       cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr -DSFML_INSTALL_XCODE_TEMPLATES=FALSE -DSFML_BUILD_FRAMEWORKS=FALSE -DBUILD_SHARED_LIBS=TRUE -DSFML_MISC_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr/share/SFML -DSFML_DEPENDENCIES_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. ;
     fi
   - if [ "${TRAVIS_OS_NAME}" == "linux" ] ; then
       cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr .. ;
     fi
-  - cmake -LA ..
+  # - cmake -LA ..
   - make install
 
 script:
   - mkdir -p ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
-  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr  -DCMAKE_CXX_FLAGS="-I${TRAVIS_BUILD_DIR}/usr/include -I${TRAVIS_BUILD_DIR}/usr/include/eigen3" .. && cmake -LA ..
+  - cmake -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr -DCMAKE_CXX_FLAGS="-I${TRAVIS_BUILD_DIR}/usr/include -I${TRAVIS_BUILD_DIR}/usr/include/eigen3" .. && cmake -LA ..
   - make
+
+before_deploy:
+  - cd ${TRAVIS_BUILD_DIR} && cp ${TRAVIS_BUILD_DIR}/build/MarbleMarcher .
+  - if [ -n "${TRAVIS_TAG}" ] ; then
+      tar cvzf MarbleMarcher-$(uname)-${TRAVIS_TAG}.tar.gz MarbleMarcher LICENSE README.md assets/ usr/lib/ ;
+    else
+      tar cvzf MarbleMarcher-$(uname)-${TRAVIS_COMMIT}.tar.gz MarbleMarcher LICENSE README.md assets/ usr/lib/ ;
+    fi
+
+deploy:
+  provider: releases
+  # Replace this key with a similarly credentialed one for your acct
+  api_key:
+    secure: NQ+AL976qJ0FGrH3QAYoMzCMog8X/RvBwXm3MYM+vGOjKyo5wGkc3TSt7AZ/na2jOCYui376l2nuGg/D/5fRqFT0T3sJYQSM1hyzut8kXuG0O3vzThHZoAvWnEtAosocw0tUBDPvpNeXIYcyleslgMVkQfuCOb7jO4YoJ0ddRGoGqLkPJ/eFe1BXDsGdYBxHbEHoPAN20uinXCSYIxzYq+vtPynlw67wWJwzKnykojmtReyt+JnIvLOat+l8OG6qWoLh5BPspB782O5vgNujfhaknWie/w8fkt4HMKIg93P9iOqqbAwqi0tTewLH/o5TlNKobkHhEFG1jHjvWdth1AQDe9OEJWWLf0NQ/qWWOOiOR3g0h/fYYDgkFNJaGa7MammVSgwv5AmOGa8O3ej2EkP9hHIDn62N64h6zGNa3pehdxmmlkyUNQ6nIkk4Mjh1YTUDGAW/sNizmuo0SqFSGodWq1Z8pa5PmTNcVi6IJmaFxORub/diOMsQbWRE6WU48JirimmIZL9rttyWMOTwcOr/+FQKvikfQqTzjTIvkbr9jDXRBQsLF/Vu7ipcXCeNrEuM0Ej2QLfiLxth1ovs/HiLNgUr4iykPhN0odHBN25JqhO/TcIMRxSsn/1AEuZ2mWvhPOUOguumN48nasBsE77iFyVzOlb/59cUdff2r/g=
+  file_glob: true
+  file: MarbleMarcher-*.tar.gz
+  overwrite: true
+  skip_cleanup: true
+  on:
+# # Turn on `all_branches` for testing purposes only
+#    all_branches: true
+    tags: true
diff --git a/README.md b/README.md
index bcb4226..20e81dd 100644
--- a/README.md
+++ b/README.md
@@ -39,3 +39,12 @@ Alternatively, one can use the platform-dependent build system, for example `Mak
 ## Launching
 * Make sure that the current working directory contains the `assets` folder
 * Run the executable generated by CMake, located in `build` (or a subdirectory)
+* If running MarbleMarcher from a tarball and you see a message like
+
+> ./MarbleMarcher: error while loading shared libraries: libsfml-graphics.so.2.5: cannot open shared object file: No such file or directory
+
+You'll just need to run MarbleMarcher with the correct `LD_LIBRARY_PATH`:
+
+```shell
+LD_LIBRARY_PATH=`pwd`/usr/lib ./MarbleMarcher
+```