Skip to content

Commit

Permalink
Cross-compiler compatibility: const -> constexpr
Browse files Browse the repository at this point in the history
As suggested in Zylann#387
This allowed 2 full Mac builds using these commands:
 ```
scons platform=osx arch=x86_64 --jobs=$(sysctl -n hw.logicalcpu) warnings=all tools=yes tests=no target=release_debug production=yes
 ```
```
scons platform=osx arch=arm64 --jobs=$(sysctl -n hw.logicalcpu) warnings=all tools=yes tests=no target=release_debug production=yes voxel_fast_noise_2=false 
```
 -


( Also after having the VulkanSDK like mentioned here[1] and after deleting the `denoise` module which doesn't like ARM64)

[1]: godotengine/godot#57622 (comment)
  • Loading branch information
duchainer authored May 18, 2022
1 parent 008c38b commit f969054
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion meshers/blocky/voxel_blocky_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class VoxelBlockyModel : public Resource {
};

struct Model {
static const uint32_t MAX_SURFACES = 2;
static constexpr uint32_t MAX_SURFACES = 2;

// A model can have up to 2 materials.
// If more is needed or profiling tells better, we could change it to a vector?
Expand Down

0 comments on commit f969054

Please sign in to comment.