From a455d3ee7d5ddefcdf008fa86ecc7c80aba758aa Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Mon, 3 Feb 2025 11:35:22 -0500
Subject: Introduce build system and preprocessor support for ARM64

---
 indra/llkdu/CMakeLists.txt  | 8 --------
 indra/llkdu/llimagej2ckdu.h | 2 ++
 indra/llkdu/llkdumem.h      | 2 ++
 3 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'indra/llkdu')

diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt
index 230803a630..411fff34ae 100644
--- a/indra/llkdu/CMakeLists.txt
+++ b/indra/llkdu/CMakeLists.txt
@@ -27,14 +27,6 @@ set(llkdu_HEADER_FILES
 
 list(APPEND llkdu_SOURCE_FILES ${llkdu_HEADER_FILES})
 
-# Our KDU package is built with KDU_X86_INTRINSICS in its .vcxproj file.
-# Unless that macro is also set for every consumer build, KDU freaks out,
-# spamming the viewer log with alignment FUD.
-set_source_files_properties(${llkdu_SOURCE_FILES}
-                            PROPERTIES
-                            COMPILE_DEFINITIONS
-                            "KDU_X86_INTRINSICS")
-
 if (USE_KDU)
   add_library (llkdu ${llkdu_SOURCE_FILES})
 
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index 8481201cbc..c9aa0c5250 100644
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -27,6 +27,8 @@
 #ifndef LL_LLIMAGEJ2CKDU_H
 #define LL_LLIMAGEJ2CKDU_H
 
+#include "llpreprocessor.h"
+
 #include "llimagej2c.h"
 
 //
diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h
index 0ad67a3f92..56aff13c76 100644
--- a/indra/llkdu/llkdumem.h
+++ b/indra/llkdu/llkdumem.h
@@ -27,6 +27,8 @@
 #ifndef LL_LLKDUMEM_H
 #define LL_LLKDUMEM_H
 
+#include "llpreprocessor.h"
+
 // Support classes for reading and writing from memory buffers in KDU
 #define kdu_xxxx "kdu_image.h"
 #include "include_kdu_xxxx.h"
-- 
cgit v1.2.3