From f3eb7559d62fbbee940ac89f34519cc39ea6c91d Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 6 Jun 2024 09:34:28 +0800 Subject: Change LL_FREEBSD to already existing __FreeBSD__ So we don't need to have a custom environment -DLL_FREEBSD=1 setting. --- indra/llrender/llfontfreetypesvg.cpp | 4 ++-- indra/llrender/llgl.cpp | 2 +- indra/llrender/llglheaders.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llfontfreetypesvg.cpp b/indra/llrender/llfontfreetypesvg.cpp index eefc1dd29b..1672aa4b96 100644 --- a/indra/llrender/llfontfreetypesvg.cpp +++ b/indra/llrender/llfontfreetypesvg.cpp @@ -34,13 +34,13 @@ #endif #define NANOSVG_IMPLEMENTATION -#if LL_FREEBSD +#if __FreeBSD__ #include #else #include #endif #define NANOSVGRAST_IMPLEMENTATION -#if LL_FREEBSD +#if __FreeBSD__ #include #else #include diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 14dd60eaa2..10920f1de3 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1164,7 +1164,7 @@ bool LLGLManager::initGL() mIsNVIDIA = TRUE; } else if (mGLVendor.find("INTEL") != std::string::npos -#if LL_LINUX || LL_FREEBSD +#if LL_LINUX || __FreeBSD__ // The Mesa-based drivers put this in the Renderer string, // not the Vendor string. || mGLRenderer.find("INTEL") != std::string::npos diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 71f8711d23..a397de499e 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -27,7 +27,7 @@ #ifndef LL_LLGLHEADERS_H #define LL_LLGLHEADERS_H -#if LL_MESA || LL_LINUX || LL_FREEBSD +#if LL_MESA || LL_LINUX || __FreeBSD__ //---------------------------------------------------------------------------- // MESA headers // quotes so we get libraries/.../GL/ version -- cgit v1.2.3