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/llwindowwin32.cpp | |
| parent | b024b356c75528b4d2688016d49a11e1270fb48d (diff) | |
| parent | 2283c5c35103dd99b35ca43a09bf8e11e6cd7957 (diff) | |
Merge branch 'main' into gltf_mesh_import
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 4fca74497f..64f20e65ca 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -576,6 +576,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks, // Make an instance of our window then define the window class mhInstance = GetModuleHandle(NULL); +#if !_M_ARM64 // Init Direct Input - needed for joystick / Spacemouse LPDIRECTINPUT8 di8_interface; @@ -590,6 +591,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks, { gDirectInput8 = di8_interface; } +#endif mSwapMethod = SWAP_METHOD_UNDEFINED; |