Fix compilation error

scp-fs2open · Apr 20, 2018 · 1fe4178 · 1fe4178
1 parent db49d99
commit 1fe4178
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,48 +1,44 @@
-language: cpp
-sudo: true
+language: generic
+sudo: required
+dist: trusty
 addons:
     apt:
+        sources:
+            - ubuntu-toolchain-r-test
         packages:
             - build-essential
+            - gcc-5
+            - g++-5
             - cmake
             - libopenal-dev
+            - libsdl2-dev
 osx_image: xcode7.3
 matrix:
     include:
         - os: linux
-          compiler: gcc
-          env: CONFIGURATION="Debug" wxWidgets_ver=2.8
+          env: CONFIGURATION="Debug" wxWidgets_ver=2.8 CC=gcc-5 CXX=g++-5
         - os: linux
-          compiler: gcc
-          env: CONFIGURATION="Debug" wxWidgets_ver=3.0
+          env: CONFIGURATION="Debug" wxWidgets_ver=3.0 CC=gcc-5 CXX=g++-5
 
         - os: linux
-          compiler: clang
-          env: CONFIGURATION="Debug" wxWidgets_ver=2.8
+          env: CONFIGURATION="Debug" wxWidgets_ver=2.8 CC=clang CXX=clang++
         - os: linux
-          compiler: clang
-          env: CONFIGURATION="Debug" wxWidgets_ver=3.0
+          env: CONFIGURATION="Debug" wxWidgets_ver=3.0 CC=clang CXX=clang++
 
         - os: osx
-          compiler: clang
           env: CONFIGURATION="Debug"
 
         - os: linux
-          compiler: gcc
-          env: CONFIGURATION="Release" wxWidgets_ver=2.8
+          env: CONFIGURATION="Release" wxWidgets_ver=2.8 CC=gcc-5 CXX=g++-5
         - os: linux
-          compiler: gcc
-          env: CONFIGURATION="Release" wxWidgets_ver=3.0
+          env: CONFIGURATION="Release" wxWidgets_ver=3.0 CC=gcc-5 CXX=g++-5
 
         - os: linux
-          compiler: clang
-          env: CONFIGURATION="Release" wxWidgets_ver=2.8
+          env: CONFIGURATION="Release" wxWidgets_ver=2.8 CC=clang CXX=clang++
         - os: linux
-          compiler: clang
-          env: CONFIGURATION="Release" wxWidgets_ver=3.0
+          env: CONFIGURATION="Release" wxWidgets_ver=3.0 CC=clang CXX=clang++
 
         - os: osx
-          compiler: clang
           env: CONFIGURATION="Release"
 before_install:
     - ./ci/travis/before_install.sh

diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
@@ -3,8 +3,8 @@
 set -e
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    sudo add-apt-repository --yes ppa:zoogie/sdl2-snapshots
-    sudo apt-get update -qq
+    # Nothing to do here
+    :
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     brew update
 fi
diff --git a/ci/travis/install.sh b/ci/travis/install.sh
@@ -7,7 +7,7 @@ CMAKE_BINS_TMP=/tmp/cmake.tar.gz
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]
 then
-    sudo apt-get install -y ninja-build libsdl2-dev  libwxgtk$wxWidgets_ver-dev
+    sudo apt-get install -y libwxgtk$wxWidgets_ver-dev
 
     if [ ! -x $HOME/cmake/bin/cmake ]
     then

diff --git a/ci/travis/script.sh b/ci/travis/script.sh
@@ -5,7 +5,7 @@ set -e
 cd travis-build
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    make -j4
+    make -j$(nproc)
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     set -o pipefail && cmake --build . --config "$CONFIGURATION" -- ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO | xcpretty
 fi
diff --git a/code/apis/FlagListManager.cpp b/code/apis/FlagListManager.cpp
@@ -716,7 +716,7 @@ FlagListManager::ProcessingStatus FlagListManager::ParseJsonData(const std::stri
 
 			openAlInfo.defaultCaptureDevice.name = jsonToWxString(openal_obj.at("default_capture"));
 
-			openAlInfo.version = wxString::Format("%d.%d",
+			openAlInfo.version = wxString::Format(wxT("%d.%d"),
 												  openal_obj.at("version_major").get<int>(),
 												  openal_obj.at("version_minor").get<int>());
 		}

diff --git a/code/apis/FlagListManager.h b/code/apis/FlagListManager.h
@@ -128,7 +128,7 @@ class FlagListManager: public wxEvtHandler {
 
 	const std::vector<Resolution>& GetResolutions() const;
 
-	wxFileName GetConfigLocation(const wxString& def_path = "") const;
+	wxFileName GetConfigLocation(const wxString& def_path = wxEmptyString) const;
 
 	const OpenAlInfo& GetOpenAlInfo() const;