We don't need Carbon on OS X anymore

apps/esmtool/CMakeLists.txt

@@ -17,11 +17,6 @@ target_link_libraries(esmtool
   components
 )
 
-#if (APPLE)
-#    find_library(CARBON_FRAMEWORK Carbon)
-#    target_link_libraries(openmw ${CARBON_FRAMEWORK})
-#endif (APPLE)
-
 if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(esmtool gcov)

apps/openmw/CMakeLists.txt

@@ -131,10 +131,9 @@ endif()
 
 
 if(APPLE)
-    find_library(CARBON_FRAMEWORK Carbon)
     find_library(COCOA_FRAMEWORK Cocoa)
     find_library(IOKIT_FRAMEWORK IOKit)
-    target_link_libraries(openmw ${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
+    target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
 
     if (FFMPEG_FOUND)
         find_library(COREVIDEO_FRAMEWORK CoreVideo)

apps/openmw/mwinput/inputmanagerimp.cpp

@@ -1,9 +1,5 @@
 #include "inputmanagerimp.hpp"
 
-#if defined(__APPLE__) && !defined(__LP64__)
-#include <Carbon/Carbon.h>
-#endif
-
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
 
@@ -56,12 +52,6 @@ namespace MWInput
         , mOverencumberedMessageDelay(0.f)
         , mAlwaysRunActive(false)
     {
-#if defined(__APPLE__) && !defined(__LP64__)
-        // Give the application window focus to receive input events
-        ProcessSerialNumber psn = { 0, kCurrentProcess };
-        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-        SetFrontProcess(&psn);
-#endif
 
         Ogre::RenderWindow* window = ogre.getWindow ();