summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-06-23 10:14:51 +0800
committerErik Kundiman <erik@megapahit.org>2025-06-23 10:14:51 +0800
commit61d49c273d0ad0a58ecd9dc54d8c48d43e17199a (patch)
treeb686837b9029402fc6706c67d407b8496bf725d3
parent98e99812072e6125411174236e1421d9312a50da (diff)
Exclude _M_ARM64 from including media plugin headers
until we are ready to enable media plugins on Windows ARM64.
-rw-r--r--indra/newview/llappviewer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 94e8fabcb2..d9596164eb 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -131,7 +131,7 @@
#include "stringize.h"
#include "llcoros.h"
#include "llexception.h"
-#if 1 // !LL_LINUX
+#if !_M_ARM64 // !LL_LINUX
#include "cef/dullahan_version.h"
#include "vlc/libvlc_version.h"
#endif // LL_LINUX
@@ -3427,7 +3427,7 @@ LLSD LLAppViewer::getViewerInfo() const
info["VOICE_VERSION"] = LLTrans::getString("NotConnected");
}
-#if 1 // !LL_LINUX
+#if !_M_ARM64 // !LL_LINUX
std::ostringstream cef_ver_codec;
cef_ver_codec << "Dullahan: ";
cef_ver_codec << DULLAHAN_VERSION_MAJOR;
@@ -3457,7 +3457,7 @@ LLSD LLAppViewer::getViewerInfo() const
info["LIBCEF_VERSION"] = "Undefined";
#endif
-#if 1 // !LL_LINUX
+#if !_M_ARM64 // !LL_LINUX
std::ostringstream vlc_ver_codec;
vlc_ver_codec << LIBVLC_VERSION_MAJOR;
vlc_ver_codec << ".";