diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-06-14 13:58:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-06-14 13:58:07 +0800 |
| commit | 582462ba123f55cc67f006fe0ecbfbba81311f84 (patch) | |
| tree | 52c00776a3da718b78079e80ad34a710439bbd94 | |
| parent | 893b93bbbcb2ffc4948f2ebca9dd86be55e79237 (diff) | |
Windows arm64 & macOS x86-64 use LL's packaged GLM
so we don't have to keep 1.0.1 on vcpkg or MacPorts around any more
(the last version they compile with, in the code's current state).
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | indra/cmake/GLM.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -137,7 +137,7 @@ $ megapahit ### Windows arm64 ``` -$ vcpkg install python3 freealut apr-util boost curl freetype glm hunspell libjpeg-turbo meshoptimizer minizip nanosvg nghttp2 openjpeg sse2neon libvorbis libxml2[tools] xxhash +$ vcpkg install python3 freealut apr-util boost curl freetype hunspell libjpeg-turbo meshoptimizer minizip nanosvg nghttp2 openjpeg sse2neon libvorbis libxml2[tools] xxhash $ vcpkg install --allow-unsupported boost-fiber $ export LL_BUILD="/MD /O2 /Ob2 /std:c++20 /Zc:wchar_t- /Zi /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0602 /D_WIN32_WINNT=0x0602 /Zc:preprocessor" $ export PATH="$VCPKG_ROOT/downloads/tools/cmake-4.3.2-windows/cmake-4.3.2-windows-arm64/bin:$VCPKG_ROOT/installed/arm64-windows/tools/libxml2:/c/Program Files (x86)/Microsoft Visual Studio/18/BuildTools/MSBuild/Current/Bin:$PATH" diff --git a/indra/cmake/GLM.cmake b/indra/cmake/GLM.cmake index e4c6796f6c..957c220bc7 100644 --- a/indra/cmake/GLM.cmake +++ b/indra/cmake/GLM.cmake @@ -4,7 +4,7 @@ include(Prebuilt) add_library( ll::glm INTERFACE IMPORTED ) #use_system_binary( glm ) -if (${LINUX_DISTRO} MATCHES debian) +if (${LINUX_DISTRO} MATCHES debian OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64)) use_prebuilt_binary(glm) elseif (NOT WINDOWS) find_package( glm REQUIRED ) |