From af92a8bc9d51f8c4fd997ee1c079fa254f9f9e82 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 7 Nov 2020 06:07:35 -0500
Subject: [PATCH] Some light de-Carbonization
---
indra/llcommon/CMakeLists.txt | 6 ------
indra/llplugin/slplugin/CMakeLists.txt | 2 +-
indra/llplugin/slplugin/slplugin-objc.mm | 3 ---
indra/llwindow/llwindowmacosx.cpp | 4 +++-
indra/newview/CMakeLists.txt | 5 +++--
indra/newview/llappviewermacosx.cpp | 5 -----
indra/newview/llfilepicker.h | 1 -
indra/newview/llfloateruipreview.cpp | 2 +-
8 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index b4d4e092137..5807c32f9d5 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -296,12 +296,6 @@ target_link_libraries(
${RT_LIBRARY}
)
-if (DARWIN)
- include(CMakeFindFrameworks)
- find_library(CARBON_LIBRARY Carbon)
- target_link_libraries(llcommon PUBLIC ${CARBON_LIBRARY})
-endif (DARWIN)
-
add_dependencies(llcommon stage_third_party_libs)
if (LL_TESTS)
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 550b67eb09c..2171deed348 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -71,7 +71,7 @@ target_link_libraries(SLPlugin
)
if (DARWIN)
- # Mac version needs to link against Carbon
+ # Mac version needs to link against Cocoa
target_link_libraries(SLPlugin ${COCOA_LIBRARY})
# Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
add_custom_command(
diff --git a/indra/llplugin/slplugin/slplugin-objc.mm b/indra/llplugin/slplugin/slplugin-objc.mm
index a5ab1d95c89..0ef6d5f74d0 100644
--- a/indra/llplugin/slplugin/slplugin-objc.mm
+++ b/indra/llplugin/slplugin/slplugin-objc.mm
@@ -49,9 +49,6 @@ void LLCocoaPlugin::setupCocoa()
// when init'ing the Cocoa App window.
[[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
- // This is a bit of voodoo taken from the Apple sample code "CarbonCocoa_PictureCursor":
- // http://developer.apple.com/samplecode/CarbonCocoa_PictureCursor/index.html
-
// Needed for Carbon based applications which call into Cocoa
NSApplicationLoad();
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 2604a23c851..72c55aff2ed 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -39,7 +39,6 @@
#include "indra_constants.h"
#include <OpenGL/OpenGL.h>
-#include <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
extern BOOL gDebugWindowProc;
@@ -1815,6 +1814,7 @@ LLSD LLWindowMacOSX::getNativeKeyData()
BOOL LLWindowMacOSX::dialogColorPicker( F32 *r, F32 *g, F32 *b)
{
+#if 0
BOOL retval = FALSE;
OSErr error = noErr;
NColorPickerInfo info;
@@ -1839,6 +1839,8 @@ BOOL LLWindowMacOSX::dialogColorPicker( F32 *r, F32 *g, F32 *b)
}
return (retval);
+#endif
+ return FALSE;
}
void *LLWindowMacOSX::getPlatformWindow()
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b974b8c7d0c..ff50d8c767e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1457,16 +1457,17 @@ if (DARWIN)
COMPILE_FLAGS "-fmodules -fcxx-modules -Wno-nullability-completeness"
)
- find_library(AGL_LIBRARY AGL)
find_library(APPKIT_LIBRARY AppKit)
find_library(COCOA_LIBRARY Cocoa)
find_library(IOKIT_LIBRARY IOKit)
+ find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(COREAUDIO_LIBRARY CoreAudio)
set(viewer_LIBRARIES
${COCOA_LIBRARY}
- ${AGL_LIBRARY}
+ ${APPKIT_LIBRARY}
${IOKIT_LIBRARY}
+ ${COREFOUNDATION_LIBRARY}
${COREAUDIO_LIBRARY}
)
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index b1a4385a913..1fbc6b3a0de 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -30,8 +30,6 @@
#error "Use only with Mac OS X"
#endif
-#define LL_CARBON_CRASH_HANDLER 1
-
#include "llwindowmacosx.h"
#include "llappviewermacosx-objc.h"
@@ -49,9 +47,6 @@
#include "llerrorcontrol.h"
#include "llvoavatarself.h" // for gAgentAvatarp->getFullname()
#include <ApplicationServices/ApplicationServices.h>
-#ifdef LL_CARBON_CRASH_HANDLER
-#include <Carbon/Carbon.h>
-#endif
#include <vector>
#include <exception>
#include <fstream>
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 632ca014d16..947f31146a3 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -36,7 +36,6 @@
#include "stdtypes.h"
#if LL_DARWIN
-#include <Carbon/Carbon.h>
// AssertMacros.h does bad things.
#undef verify
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 6872b2f1f70..03968415216 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -72,7 +72,7 @@
#include <map>
#if LL_DARWIN
-#include <CoreFoundation/CFURL.h>
+#include <CoreFoundation/CoreFoundation.h>
#endif
// Static initialization
--
GitLab