From e3f90ff6b6c54f45101f06e354553e0645416068 Mon Sep 17 00:00:00 2001 From: CDAGaming Date: Sun, 31 Dec 2017 11:53:41 -0600 Subject: [PATCH 1/2] Travis Quick Fix + Minor Submodule Updates ## Info (Edited) This commit fixes several Travis-Related Warnings/Errors/Deprecations in MacOS(Now running on Sierra instead of El Capitan). These Issues included Path Not Set Warnings, shell_session warnings, and a few others. This Commit also Updates the following Submodules: - enet (Includes Minor CMakeList Changes for cleaner Solutions) - Nihstro (Includes a bugfix on compiling with Boost v1.66.0) --- .travis.yml | 2 +- externals/enet | 2 +- externals/nihstro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9624d4483..2846a42fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - os: osx env: NAME="macos build" sudo: false - osx_image: xcode7.3 + osx_image: xcode9.2 install: "./.travis/macos/deps.sh" script: "./.travis/macos/build.sh" after_success: "./.travis/macos/upload.sh" diff --git a/externals/enet b/externals/enet index a84c120ef..39a72ab19 160000 --- a/externals/enet +++ b/externals/enet @@ -1 +1 @@ -Subproject commit a84c120eff13d2fa3eadb41ef7afe0f7819f4d6c +Subproject commit 39a72ab1990014eb399cee9d538fd529df99c6a0 diff --git a/externals/nihstro b/externals/nihstro index 7e24743af..28ac07a52 160000 --- a/externals/nihstro +++ b/externals/nihstro @@ -1 +1 @@ -Subproject commit 7e24743af21a7c2e3cef21ef174ae4269d0cfdac +Subproject commit 28ac07a5273b6250cfafb4630bee8da820ad33d7 From 51169de364c1d24a0e1baf11335ffebf85cbe5ef Mon Sep 17 00:00:00 2001 From: CDAGaming Date: Mon, 15 Jan 2018 21:20:49 -0600 Subject: [PATCH 2/2] Update nihstro --- externals/nihstro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/nihstro b/externals/nihstro index 28ac07a52..fd69de1a1 160000 --- a/externals/nihstro +++ b/externals/nihstro @@ -1 +1 @@ -Subproject commit 28ac07a5273b6250cfafb4630bee8da820ad33d7 +Subproject commit fd69de1a1b960ec296cc67d32257b0f9e2d89ac6