From 4ca79d1f662f26b43a057f077676c090af4a9aca Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Fri, 4 Oct 2019 15:33:33 -0500 Subject: [PATCH 1/2] Fix constexpr mismatch --- src/Terrain/PlanetWrenderer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Terrain/PlanetWrenderer.h b/src/Terrain/PlanetWrenderer.h index 82bee68..50025ad 100644 --- a/src/Terrain/PlanetWrenderer.h +++ b/src/Terrain/PlanetWrenderer.h @@ -352,12 +352,12 @@ class PlanetWrenderer void find_refs(SubTriangle& tri); }; -inline bool PlanetWrenderer::is_ready() const +constexpr bool PlanetWrenderer::is_ready() const { return m_ready; } -inline unsigned PlanetWrenderer::get_index(int x, int y) const +constexpr unsigned PlanetWrenderer::get_index(int x, int y) const { return unsigned(y * (y + 1) / 2 + x); } From 32239052f3a2168d354dd911af9942bf6b0bebc3 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Wed, 25 Sep 2019 16:37:40 -0500 Subject: [PATCH 2/2] Attempt to configure continuous integration on two major CI platforms --- .travis.yml | 23 +++++++++++++++++++++ appveyor.yml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 .travis.yml create mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9632e2c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,23 @@ +matrix: + include: + - os: linux + dist: bionic + compiler: gcc + addons: &mesa-dev + apt: + packages: + - libgl1-mesa-dev + - os: linux + dist: bionic + compiler: clang + addons: *mesa-dev +sudo: false +language: cpp +script: + - git clone https://github.com/urho3d/Urho3D + - cd Urho3D + - cmake . -DURHO3D_SAMPLES=OFF + - cmake --build . --target all + - cd ../ + - cmake . -DURHO3D_SRC=${CWD}/Urho3D -DURHO3D_HOME=${CWD}/Urho3D + - cmake --build . --target all diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..07f11e0 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,57 @@ +version: 1.0.{build} +image: + - Visual Studio 2019 + - Ubuntu1804 + +environment: + CLICOLOR_FORCE: 1 + CHERE_INVOKING: 1 # Tell Bash to inherit the current working directory + matrix: + - MSYSTEM: MSVC + - MSYSTEM: LINUX + +matrix: + exclude: + - image: Visual Studio 2019 + MSYSTEM: LINUX + - image: Ubuntu1804 + MSYSTEM: MSVC + +for: + - matrix: + only: + - MSYSTEM: MSVC + build_script: + - cmd: >- + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" + + git clone https://github.com/urho3d/Urho3D + + cd Urho3D + + cmake . -DURHO3D_SAMPLES=OFF + + dir + + cmake --build . --target ALL_BUILD --parallel + + cd ../ + + cmake . -DURHO3D_SRC=Urho3D -DURHO3D_HOME=Urho3D + + cmake --build . --target ALL_BUILD --parallel + + - matrix: + only: + - image: Ubuntu1804 + install: sudo apt install -y libgl1-mesa-dev + build_script: + - git clone https://github.com/urho3d/Urho3D + - cd Urho3D + - cmake . -DURHO3D_SAMPLES=OFF + - cmake --build . --target all --parallel + - cd ../ + - cmake . -DURHO3D_SRC=${CWD}/Urho3D -DURHO3D_HOME=${CWD}/Urho3D + - cmake --build . --target all --parallel + +test: off