Skip to content

Commit 26b04ec

Browse files
committed
Fix genbindings ci
1 parent 124f086 commit 26b04ec

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

3rdparty/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
## JoltPhysics
9898
- [![Upstream](https://img.shields.io/github/v/release/jrouwe/JoltPhysics?label=Upstream)](https://github.com/jrouwe/JoltPhysics)
99-
- Version: v5.5.0
99+
- Version: v5.6.0 with modified CMake scripts for cross-platform compatibility
100100
- License: MIT
101101

102102
## jpeg-turbo

CMakeOptions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
- AX_GLES_PROFILE: specify GLES profile version, only works when selected render api is `gl`, default: `300`, valid value `300`, `310`
4141
- AX_CORE_PROFILE: whether strip all deprecated features, default `FALSE`, Setting this to `TRUE` before upgrading your game project helps ensure compatibility with future Axmol versions.
4242
- AX_ISA_LEVEL: specifiy SIMD Instructions Acceleration Level: 0~4, 0: disabled, 1: SSE2, 2: SSE4.1/NEON, 3: SSE4.2, 4: AVX2, default: 2
43+
- AX_PROFILER_BACKEND: specifiy profiler backend, valid values are: `TRACY`, `NONE`, default: `NONE`
4344
- AX_WASM_THREADS: specify wasm thread count, valid value: number: `>=0` , string: must be: `auto` or `navigator.hardwareConcurrency`(default),
4445
- number: explicit set thread count, `0` means disable wasm thread support
4546
- string:
@@ -54,6 +55,7 @@ default is: `navigator.hardwareConcurrency`
5455
- AX_WASM_ASSETS_PRELOAD_FILE: Whether enable to bundle the assets to a .data file and preload them into an IndexedDB cache at first launch (`--preload-file`), otherwise bundle them into the wasm file itself and don't use the IndexedDB at all (`--embed-file`)", default `TRUE`
5556
- AX_WASM_GENERATE_SYMBOL_FILE: Generate a symbol file for the built wasm file, default `FALSE`
5657

58+
5759
## The options for axmol apps
5860

5961
- AX_PREBUILT_DIR: specify the prebuilt dir (relative to `AX_ROOT`), it's very useful for fast linking apps with prebuilt engine libs

axmol/base/Profiling.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ extern bool kProfilerCategoryParticles;
149149

150150
#if defined(AX_PROFILER_BACKEND_TRACY)
151151
# include "axmol/base/ProfilingBackendTracy.h"
152-
#elif defined(AX_PROFILER_BACKEND_NONE)
152+
#else // Fallback no-op if no valid profiler backend specified
153153
# include "axmol/base/ProfilingBackendNoop.h"
154-
#else
155-
# error "No valid profiling backend selected"
156154
#endif

cmake/Modules/AXBuildHelpers.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -944,9 +944,7 @@ endmacro()
944944
macro(ax_apply_profiler_backend target_name scope)
945945
if(AX_PROFILER_BACKEND STREQUAL "TRACY")
946946
target_compile_definitions(${target_name} ${scope} AX_PROFILER_BACKEND_TRACY)
947-
elseif(AX_PROFILER_BACKEND STREQUAL "NONE")
948-
target_compile_definitions(${target_name} ${scope} AX_PROFILER_BACKEND_NONE)
949-
else()
947+
elseif(NOT AX_PROFILER_BACKEND STREQUAL "NONE")
950948
message(FATAL_ERROR "Unknown AX_PROFILER_BACKEND: ${AX_PROFILER_BACKEND}")
951949
endif()
952950
endmacro()

0 commit comments

Comments
 (0)