From 991e63ab8b649258db7c73d9c8793e3a0cde6a1d Mon Sep 17 00:00:00 2001 From: aismann Date: Sun, 14 Jan 2024 08:56:08 +0100 Subject: [PATCH] Set DrawNodeEx default to 'OFF" (#1613) * Set DrawNodeEx default to 'OFF" * Update controller.cpp * Update CMakeOptions.md --- CMakeOptions.md | 2 +- core/CMakeLists.txt | 2 +- tests/cpp-tests/Source/controller.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeOptions.md b/CMakeOptions.md index 64129d087553..d3f95cbb917f 100644 --- a/CMakeOptions.md +++ b/CMakeOptions.md @@ -27,7 +27,7 @@ - AX_ENABLE_EXT_EFFEKSEER: the effekseer extension, default: `FALSE` - AX_ENABLE_EXT_JSONDEFAULT: the UserDefault based on json, default: `FALSE` - AX_ENABLE_EXT_LUA: the lua extension, default: `TRUE` - - AX_ENABLE_EXT_DRAWNODEEX: the DrawNodeEx extension, default: `TRUE` + - AX_ENABLE_EXT_DRAWNODEEX: the DrawNodeEx extension, default: `FALSE` - AX_WITH_XXX: usually user don't need care it - AX_VS_DEPLOYMENT_TARGET: specify windows store deploy target, default: `10.0.17763.0` - AX_USE_COMPAT_GL: whether use compat gl as renderer backend, default: win32: `TRUE`, others: `FALSE` diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index ebb328f0e467..03aa3a53dd70 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -140,7 +140,7 @@ option(AX_DISABLE_GLES2 "Whether disable GLES2 support" OFF) option(AX_ENABLE_EXT_JSONDEFAULT "Build extension JSONDefault" ON) -option(AX_ENABLE_EXT_DRAWNODEEX "Build extension DrawNodeEx" ON) +option(AX_ENABLE_EXT_DRAWNODEEX "Build extension DrawNodeEx" OFF) if(XCODE) # set(CMAKE_BUILD_WITH_INSTALL_RPATH YES) diff --git a/tests/cpp-tests/Source/controller.cpp b/tests/cpp-tests/Source/controller.cpp index e571f602ffb4..c4647a0a8a97 100644 --- a/tests/cpp-tests/Source/controller.cpp +++ b/tests/cpp-tests/Source/controller.cpp @@ -48,7 +48,7 @@ class RootTests : public TestList #pragma message("The optional extension Effekseer is enabled.") addTest("Effekseer", []() { return new EffekseerTests(); }); #endif -#if __has_include("DrawNodeExTest/DrawNodeExTest.h") +#if __has_include("DrawNodeExTest.h") # pragma message("The optional extension DrawNodeEx is enabled.") addTest("DrawNodeEx", []() { return new DrawNodeExTests(); }); #endif