BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-13 23:58:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

check environment variables E2D_WITHOUT_AUDIO and E2D_WITHOUT_GRAPHICS on engine start

Browse Source
This commit is contained in:
Matvey Cherevko
2019-07-31 03:06:37 +07:00
parent 3160547fa1
commit 28706cc9bf
9 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@@ -1,4 +1,8 @@
version: "{build}"
environment:
global:
- E2D_WITHOUT_AUDIO=true
- E2D_WITHOUT_GRAPHICS=true
image:
- Visual Studio 2017
- Visual Studio 2019 Preview

4
.travis.yml
View File

@@ -1,4 +1,8 @@
language: cpp
env:
global:
- E2D_WITHOUT_AUDIO=true
- E2D_WITHOUT_GRAPHICS=true
matrix:
include:
- os: linux

12
sources/enduro2d/core/engine.cpp
View File

@@ -406,7 +406,11 @@ namespace e2d
// setup audio
if ( !params.without_audio() ) {
const bool without_audio =
params.without_audio() ||
!!std::getenv("E2D_WITHOUT_AUDIO");
if ( !without_audio ) {
safe_module_initialize<audio>(
the<debug>());
}
@@ -419,7 +423,11 @@ namespace e2d
// setup graphics
if ( !params.without_graphics() )
const bool without_graphics =
params.without_graphics() ||
!!std::getenv("E2D_WITHOUT_GRAPHICS");
if ( !without_graphics )
{
// setup window

8
untests/sources/untests_core/render.cpp
View File

@@ -13,9 +13,7 @@ namespace
public:
safe_engine_initializer() {
modules::initialize<engine>(0, nullptr,
engine::parameters("renderer_untests", "enduro2d")
.without_audio(true)
.without_graphics(true));
engine::parameters("renderer_untests", "enduro2d"));
}
~safe_engine_initializer() noexcept {
@@ -26,7 +24,6 @@ namespace
TEST_CASE("render"){
safe_engine_initializer initializer;
SECTION("sampler_state"){
{
const auto ss = render::sampler_state();
@@ -260,8 +257,7 @@ TEST_CASE("render"){
bad_render_operation);
}
//if ( r.device_capabilities().dxt5_compression_supported ) // TODO: wait for android branch
{
if ( r.device_capabilities().dxt_compression_supported ) {
str resources;
REQUIRE(filesystem::extract_predef_path(
resources,

4
untests/sources/untests_high/asset.cpp
View File

@@ -14,9 +14,7 @@ namespace
safe_starter_initializer() {
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("asset_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
engine::parameters("asset_untests", "enduro2d")));
}
~safe_starter_initializer() noexcept {

4
untests/sources/untests_high/library.cpp
View File

@@ -14,9 +14,7 @@ namespace
safe_starter_initializer() {
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("library_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
engine::parameters("library_untests", "enduro2d")));
}
~safe_starter_initializer() noexcept {

4
untests/sources/untests_high/node.cpp
View File

@@ -14,9 +14,7 @@ namespace
safe_starter_initializer() {
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("world_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
engine::parameters("world_untests", "enduro2d")));
}
~safe_starter_initializer() noexcept {

4
untests/sources/untests_high/starter.cpp
View File

@@ -10,8 +10,6 @@ using namespace e2d;
TEST_CASE("starter"){
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("starter_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
engine::parameters("starter_untests", "enduro2d")));
modules::shutdown<starter>();
}

4
untests/sources/untests_high/world.cpp
View File

@@ -14,9 +14,7 @@ namespace
safe_starter_initializer() {
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("world_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
engine::parameters("world_untests", "enduro2d")));
}
~safe_starter_initializer() noexcept {