Some light de-Carbonization

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)

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(

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();
 

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()

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}
     )
 

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>

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

indra/newview/llfloateruipreview.cpp

@@ -72,7 +72,7 @@
 #include <map>
 
 #if LL_DARWIN
-#include <CoreFoundation/CFURL.h>
+#include <CoreFoundation/CoreFoundation.h>
 #endif
 
 // Static initialization