Merging...

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,12 @@
+Reporting a bug? Please make sure you've given the following information - thanks!
+
+**Operating system and version:**
+
+
+**Is this for single player or multiplayer?**
+
+
+**Description of the bug (and if possible, steps to reproduce the bug):**
+
+
+**What did you expect to happen instead?**

.gitignore

@@ -172,4 +172,6 @@ pip-log.txt
 ## Unix
 #############
 *.o
-*.so
+*.so
+
+xcode

.travis.yml

@@ -1,22 +1,69 @@
 language: cpp
-sudo: true
 
-install:
-  - ./tools/travis-install.sh "${host:-native}" "${flavour:-Release}" $opts
+addons:
+  apt:
+    packages:
+      - libsdl2-dev
+      - libjpeg-turbo8-dev
+      - zlib1g-dev
+      - libpng12-dev
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2 --universal; fi
 
 script:
   - ./tools/travis-build.sh "${host:-native}" "${flavour:-Release}" $opts
 
-compiler: gcc
-env:
-  - ""
-  - flavour=Debug
-  #- host=i686-linux-gnu
-  - host=i686-w64-mingw32
-  - host=x86_64-w64-mingw32
-
-# One extra build with clang, its warnings are often better
 matrix:
   include:
-    - compiler: clang
-      env: ""
+    - os: linux
+      dist: trusty
+      sudo: required
+      compiler: gcc
+    - os: linux
+      dist: trusty
+      sudo: required
+      compiler: clang
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+
+before_deploy:
+  - export DEPLOY_FILE_NAME=jaenhanced_$TRAVIS_OS_NAME-$CC.zip
+  - echo "zipping into $DEPLOY_FILE_NAME"
+  - cd $(pwd)/build/install
+  - zip -r $DEPLOY_FILE_NAME . -i \*
+  - echo "deploying $DEPLOY_FILE_NAME to GitHub"
+
+deploy:
+  provider: releases
+  api_key: $GITHUB_KEY
+  overwrite: true
+  file: "$DEPLOY_FILE_NAME"
+  skip_cleanup: true
+  on:
+    tags: true
+
+
+#dist: trusty
+
+#install:
+#  - ./tools/travis-install.sh "${host:-native}" "${flavour:-Release}" $opts
+
+#script:
+#  - ./tools/travis-build.sh "${host:-native}" "${flavour:-Release}" $opts
+
+#compiler: gcc
+#env:
+#  - ""
+#  - flavour=Debug
+#  - host=i686-linux-gnu
+#  - host=i686-w64-mingw32
+#  - host=x86_64-w64-mingw32
+
+# One extra build with clang, its warnings are often better
+#matrix:
+#  include:
+#    - compiler: clang
+#      env: ""