From 4df23896e5acb1bd9785d4bf5f775483d6be93f5 Mon Sep 17 00:00:00 2001
From: Jens Verwiebe <info@jensverwiebe.de>
Date: Tue, 5 Nov 2013 14:35:09 +0000
Subject: [PATCH] OSX: removing useless cocoa conditionals as it's solely api
 now

---
 intern/ghost/CMakeLists.txt                |  2 +-
 intern/ghost/intern/GHOST_ISystem.cpp      | 10 +---------
 intern/ghost/intern/GHOST_ISystemPaths.cpp |  8 --------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 15ee2644ca3..f4faa6ed84e 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -301,6 +301,6 @@ add_definitions(-DGLEW_STATIC)
 blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
 
 # workaround for apple clang mangling extern "C" symbols
-if(WITH_INPUT_NDOF AND WITH_COCOA)
+if(WITH_INPUT_NDOF)
 	blender_add_lib(bf_intern_ghostndof3dconnexion "${SRC_NDOF3DCONNEXION}" "${INC}" "${INC_SYS}")
 endif()
diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp
index f6973caad03..009753cb29e 100644
--- a/intern/ghost/intern/GHOST_ISystem.cpp
+++ b/intern/ghost/intern/GHOST_ISystem.cpp
@@ -46,11 +46,7 @@
 #  include "GHOST_SystemWin32.h"
 #else
 #  ifdef __APPLE__
-#    ifdef GHOST_COCOA
-#      include "GHOST_SystemCocoa.h"
-#    else
-#      include "GHOST_SystemCarbon.h"
-#    endif
+#    include "GHOST_SystemCocoa.h"
 #  else
 #    include "GHOST_SystemX11.h"
 #  endif
@@ -72,11 +68,7 @@ GHOST_TSuccess GHOST_ISystem::createSystem()
 		m_system = new GHOST_SystemWin32();
 #else
 #  ifdef __APPLE__
-#    ifdef GHOST_COCOA
 		m_system = new GHOST_SystemCocoa();
-#    else
-		m_system = new GHOST_SystemCarbon();
-#    endif
 #  else
 		m_system = new GHOST_SystemX11();
 #  endif
diff --git a/intern/ghost/intern/GHOST_ISystemPaths.cpp b/intern/ghost/intern/GHOST_ISystemPaths.cpp
index ae9a8e49057..581467fb666 100644
--- a/intern/ghost/intern/GHOST_ISystemPaths.cpp
+++ b/intern/ghost/intern/GHOST_ISystemPaths.cpp
@@ -42,11 +42,7 @@
 #  include "GHOST_SystemPathsWin32.h"
 #else
 #  ifdef __APPLE__
-#    ifdef GHOST_COCOA
 #      include "GHOST_SystemPathsCocoa.h"
-#    else
-#      include "GHOST_SystemPathsCarbon.h"
-#    endif
 #  else
 #    include "GHOST_SystemPathsX11.h"
 #  endif
@@ -64,11 +60,7 @@ GHOST_TSuccess GHOST_ISystemPaths::create()
 		m_systemPaths = new GHOST_SystemPathsWin32();
 #else
 #  ifdef __APPLE__
-#    ifdef GHOST_COCOA
 		m_systemPaths = new GHOST_SystemPathsCocoa();
-#    else
-		m_systemPaths = new GHOST_SystemPathsCarbon();
-#    endif
 #  else
 		m_systemPaths = new GHOST_SystemPathsX11();
 #  endif