diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:21:58 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:21:58 +0800 |
commit | d32b1c090f396824c5ec2ffbc40b174a55bdbe0b (patch) | |
tree | bdf6f1753b8ec7b37aa0831e6ff0beeffcefd869 /indra/llwindow/llwindowsdl.h | |
parent | b024b356c75528b4d2688016d49a11e1270fb48d (diff) | |
parent | 2283c5c35103dd99b35ca43a09bf8e11e6cd7957 (diff) |
Merge branch 'main' into gltf_mesh_import
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
-rw-r--r-- | indra/llwindow/llwindowsdl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 144216f658..076d7234bc 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -32,7 +32,7 @@ #include "llwindow.h" #include "lltimer.h" -#if !defined(__i386__) && !defined(__x86_64__) +#if !defined(__i386__) && !defined(__x86_64__) && !_M_X64 #define SDL_DISABLE_IMMINTRIN_H #endif #include "SDL2/SDL.h" |