Darwin not (directly) relying on Carbon & Obj-C

HiDPI support & multi threaded OpenGL haven't been used since we
switched to SDL2 on Darwin, and so far there hasn't been any sign
that things aren't working any more significantly.

4 files changed, 10 insertions, 10 deletions

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index e0b3f6ef56..2d19e3df90 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -36,7 +36,7 @@
 #ifndef LL_USESYSTEMLIBS
 extern LLControlGroup gSavedSettings;
 #endif
-#if LL_DARWIN
+#if LL_DARWIN && !LL_SDL
 extern BOOL gHiDPISupport;
 #endif
 
@@ -370,7 +370,7 @@ void LLPluginClassMedia::setSizeInternal(void)
 		mRequestedMediaHeight = nextPowerOf2(mRequestedMediaHeight);
 	}
 
-#if LL_DARWIN
+#if LL_DARWIN && !LL_SDL
     if (!gHiDPISupport)
 #endif
     {
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 9cf31d60d5..120fd1213d 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -89,7 +89,7 @@ if (USESYSTEMLIBS)
 
 endif (USESYSTEMLIBS)
 
-if (DARWIN)
+if (DARWIN AND (NOT USESYSTEMLIBS))
   list(APPEND llwindow_SOURCE_FILES
     llkeyboardmacosx.cpp
     llwindowmacosx.cpp
@@ -111,7 +111,7 @@ if (DARWIN)
       PROPERTIES
       COMPILE_FLAGS "-Wno-deprecated-declarations -fpascal-strings"
       )
-endif (DARWIN)
+endif (DARWIN AND (NOT USESYSTEMLIBS))
 
 
 if (WINDOWS)
@@ -181,10 +181,10 @@ endif (SDL_FOUND)
   target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
   target_include_directories(llwindow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
   
-if (DARWIN)
+if (DARWIN AND (NOT USESYSTEMLIBS))
   include(CMakeFindFrameworks)
   find_library(CARBON_LIBRARY Carbon)
   target_link_libraries(llwindow ${CARBON_LIBRARY})
-endif (DARWIN)
+endif (DARWIN AND (NOT USESYSTEMLIBS))
 
 include(LibraryInstall)
diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h
index 2a700ce8e9..0cfba78c5b 100644
--- a/indra/llwindow/llkeyboard.h
+++ b/indra/llwindow/llkeyboard.h
@@ -76,7 +76,7 @@ public:
 	virtual BOOL	handleKeyUp(const U32 key, MASK mask) = 0;
 	virtual BOOL	handleKeyDown(const U32 key, MASK mask) = 0;
 	
-#ifdef LL_DARWIN
+#if defined(LL_DARWIN) && !defined(LL_SDL)
 	// We only actually use this for OS X.
 	virtual void	handleModifier(MASK mask) = 0;
 #endif // LL_DARWIN
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 23e6b16103..a63785990f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -288,7 +288,7 @@ extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 extern BOOL gDebugGL;
 
-#if LL_DARWIN
+#if LL_DARWIN && !LL_SDL
 extern BOOL gHiDPISupport;
 #endif
 
@@ -568,7 +568,7 @@ static void settings_to_globals()
 	gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
     LLWorldMapView::setScaleSetting(gSavedSettings.getF32("MapScale"));
 	
-#if LL_DARWIN
+#if LL_DARWIN && !LL_SDL
     LLWindowMacOSX::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL");
 	gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI");
 #endif
@@ -3310,7 +3310,7 @@ LLSD LLAppViewer::getViewerInfo() const
     info["GPU_SHADERS"] = gSavedSettings.getBOOL("RenderDeferred") ? "Enabled" : "Disabled";
     info["TEXTURE_MEMORY"] = gSavedSettings.getS32("TextureMemory");
 
-#if LL_DARWIN
+#if LL_DARWIN && !LL_SDL
     info["HIDPI"] = gHiDPISupport;
 #endif