diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-06-23 06:24:33 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-06-23 06:36:22 +0800 |
| commit | f5de250c3e74ecc8eb658d0b070c0884616f041d (patch) | |
| tree | 46bf2fd1342d3a1bd3db718e566daef32035ae21 | |
| parent | 1f87660273bcf6f4cafe5db75a668354485b2a50 (diff) | |
Revert "GLM_FORCE_NEON for Windows arm64 too"
This reverts commit 75012c4f0c0b852c8bfa0b5632bf82c82f240754.
I realised I was in the wrong direction after I avoided the
offending lines by setting GLM_FORCE_XYZW_ONLY, and then by setting
GLM_FORCE_CXX_UNKNOWN, to end up with the same 16 __m128-related
"too many initializers" errors, which I believe were just obscured
by the 160 syntax errors, which are to be fixed in the next commit.
I had already mentioned SSE2NEON being responsible for translating
__m128, but I had forgotten that it was a different package from
GLM, obviously, that __m128 was never GLM_FORCE_NEON's
responsibility.
| -rw-r--r-- | indra/cmake/00-Common.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index c8520b53ab..5cb0c23d6d 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -33,8 +33,10 @@ add_compile_definitions( ADDRESS_SIZE=${ADDRESS_SIZE}) # -- which we do. Without one or the other, we get a ton of Boost warnings. add_compile_definitions(BOOST_BIND_GLOBAL_PLACEHOLDERS) -if(CMAKE_OSX_ARCHITECTURES MATCHES arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES aarch64 OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64)) +if(CMAKE_OSX_ARCHITECTURES MATCHES arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) add_compile_definitions(GLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 GLM_FORCE_NEON=1 GLM_ENABLE_EXPERIMENTAL=1) +elseif($ENV{MSYSTEM_CARCH} MATCHES aarch64) +add_compile_definitions(GLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 GLM_ENABLE_EXPERIMENTAL=1) else() # Force enable SSE2 instructions in GLM per the manual # https://github.com/g-truc/glm/blob/master/manual.md#section2_10 |