mirror of
https://github.com/enduro2d/enduro2d.git
synced 2025-12-16 14:08:59 +07:00
add cpp17 build flags, remove old compilers from CI
This commit is contained in:
@@ -2,6 +2,7 @@ version: "{build}"
|
|||||||
image:
|
image:
|
||||||
- Visual Studio 2015
|
- Visual Studio 2015
|
||||||
- Visual Studio 2017
|
- Visual Studio 2017
|
||||||
|
- Visual Studio 2019 Preview
|
||||||
platform:
|
platform:
|
||||||
- Win32
|
- Win32
|
||||||
- x64
|
- x64
|
||||||
|
|||||||
50
.travis.yml
50
.travis.yml
@@ -1,18 +1,6 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
|
||||||
dist: trusty
|
|
||||||
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-4.9"] } }
|
|
||||||
env: MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
|
|
||||||
- os: linux
|
|
||||||
dist: trusty
|
|
||||||
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-5"] } }
|
|
||||||
env: MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
|
|
||||||
- os: linux
|
|
||||||
dist: trusty
|
|
||||||
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-6"] } }
|
|
||||||
env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
|
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: trusty
|
dist: trusty
|
||||||
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-7"] } }
|
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-7"] } }
|
||||||
@@ -21,18 +9,6 @@ matrix:
|
|||||||
dist: trusty
|
dist: trusty
|
||||||
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } }
|
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } }
|
||||||
env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
|
env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
|
||||||
- os: linux
|
|
||||||
dist: trusty
|
|
||||||
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.8"], packages: ["xorg-dev", "clang-3.8", "g++-5"] } }
|
|
||||||
env: MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
|
|
||||||
- os: linux
|
|
||||||
dist: trusty
|
|
||||||
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.9"], packages: ["xorg-dev", "clang-3.9", "g++-5"] } }
|
|
||||||
env: MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
|
|
||||||
- os: linux
|
|
||||||
dist: trusty
|
|
||||||
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-4.0"], packages: ["xorg-dev", "clang-4.0", "g++-5"] } }
|
|
||||||
env: MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
|
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: trusty
|
dist: trusty
|
||||||
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"], packages: ["xorg-dev", "clang-5.0", "g++-7"] } }
|
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"], packages: ["xorg-dev", "clang-5.0", "g++-7"] } }
|
||||||
@@ -41,24 +17,14 @@ matrix:
|
|||||||
dist: trusty
|
dist: trusty
|
||||||
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"], packages: ["xorg-dev", "clang-6.0", "g++-7"] } }
|
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"], packages: ["xorg-dev", "clang-6.0", "g++-7"] } }
|
||||||
env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
|
env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
|
||||||
- os: osx
|
- os: linux
|
||||||
osx_image: xcode8.3
|
dist: trusty
|
||||||
compiler: clang
|
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-7"], packages: ["xorg-dev", "clang-7", "g++-7"] } }
|
||||||
- os: osx
|
env: MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
|
||||||
osx_image: xcode9
|
- os: linux
|
||||||
compiler: clang
|
dist: trusty
|
||||||
- os: osx
|
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-8"], packages: ["xorg-dev", "clang-8", "g++-7"] } }
|
||||||
osx_image: xcode9.1
|
env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
|
||||||
compiler: clang
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode9.2
|
|
||||||
compiler: clang
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode9.3
|
|
||||||
compiler: clang
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode9.4
|
|
||||||
compiler: clang
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode10
|
osx_image: xcode10
|
||||||
compiler: clang
|
compiler: clang
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ target_compile_options(${PROJECT_NAME}
|
|||||||
-Wno-deprecated-declarations>)
|
-Wno-deprecated-declarations>)
|
||||||
|
|
||||||
target_compile_features(${PROJECT_NAME}
|
target_compile_features(${PROJECT_NAME}
|
||||||
PUBLIC cxx_std_14)
|
PUBLIC cxx_std_17)
|
||||||
|
|
||||||
target_compile_definitions(${PROJECT_NAME}
|
target_compile_definitions(${PROJECT_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* This file is part of the "Enduro2D"
|
|
||||||
* For conditions of distribution and use, see copyright notice in LICENSE.md
|
|
||||||
* Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include "_high.hpp"
|
|
||||||
using namespace e2d;
|
|
||||||
|
|
||||||
namespace
|
|
||||||
{
|
|
||||||
class safe_starter_initializer final : private noncopyable {
|
|
||||||
public:
|
|
||||||
safe_starter_initializer() {
|
|
||||||
modules::initialize<starter>(0, nullptr,
|
|
||||||
starter::parameters(
|
|
||||||
engine::parameters("component_untests", "enduro2d")
|
|
||||||
.without_graphics(true)));
|
|
||||||
}
|
|
||||||
|
|
||||||
~safe_starter_initializer() noexcept {
|
|
||||||
modules::shutdown<starter>();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_CASE("component") {
|
|
||||||
safe_starter_initializer initializer;
|
|
||||||
library& l = the<library>();
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -63,7 +63,6 @@ namespace
|
|||||||
|
|
||||||
TEST_CASE("node") {
|
TEST_CASE("node") {
|
||||||
safe_starter_initializer initializer;
|
safe_starter_initializer initializer;
|
||||||
world& w = the<world>();
|
|
||||||
SECTION("empty_node") {
|
SECTION("empty_node") {
|
||||||
auto n = node::create();
|
auto n = node::create();
|
||||||
REQUIRE(n);
|
REQUIRE(n);
|
||||||
|
|||||||
Reference in New Issue
Block a user