From e83f169da1395c7afcfe706aa498ec672cbfaf12 Mon Sep 17 00:00:00 2001
From: Jens Verwiebe <info@jensverwiebe.de>
Date: Tue, 5 Nov 2013 14:09:17 +0000
Subject: OSX/cmake: ghost carbon removal

---
 intern/ghost/CMakeLists.txt | 66 +++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 44 deletions(-)

(limited to 'intern/ghost/CMakeLists.txt')

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 2cc0f476d30..15ee2644ca3 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -131,17 +131,10 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 
 	# ack, this is still system dependant
 	if(APPLE)
-		if(WITH_COCOA)
-			list(APPEND SRC
-				intern/GHOST_SystemPathsCocoa.mm
-				intern/GHOST_SystemPathsCocoa.h
-			)
-		else()
-			list(APPEND SRC
-				intern/GHOST_SystemPathsCarbon.cpp
-				intern/GHOST_SystemPathsCarbon.h
-			)
-		endif()
+		list(APPEND SRC
+			intern/GHOST_SystemPathsCocoa.mm
+			intern/GHOST_SystemPathsCocoa.h
+		)
 
 	elseif(UNIX)
 		list(APPEND SRC
@@ -172,41 +165,26 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 	endif()
 
 elseif(APPLE)
-	if(WITH_COCOA)
-		list(APPEND SRC
-			intern/GHOST_DisplayManagerCocoa.mm
-			intern/GHOST_SystemCocoa.mm
-			intern/GHOST_SystemPathsCocoa.mm
-			intern/GHOST_WindowCocoa.mm
-
-			intern/GHOST_DisplayManagerCocoa.h
-			intern/GHOST_SystemCocoa.h
-			intern/GHOST_SystemPathsCocoa.h
-			intern/GHOST_WindowCocoa.h
-		)
-
-		if(WITH_INPUT_NDOF)
-			list(APPEND SRC
-				intern/GHOST_NDOFManagerCocoa.mm
-				intern/GHOST_NDOFManagerCocoa.h
-			)
-			list(APPEND SRC_NDOF3DCONNEXION
-				intern/GHOST_NDOFManager3Dconnexion.c
-				intern/GHOST_NDOFManager3Dconnexion.h
-			)
-		endif()
+	list(APPEND SRC
+		intern/GHOST_DisplayManagerCocoa.mm
+		intern/GHOST_SystemCocoa.mm
+		intern/GHOST_SystemPathsCocoa.mm
+		intern/GHOST_WindowCocoa.mm
+
+		intern/GHOST_DisplayManagerCocoa.h
+		intern/GHOST_SystemCocoa.h
+		intern/GHOST_SystemPathsCocoa.h
+		intern/GHOST_WindowCocoa.h
+	)
 
-	else()
+	if(WITH_INPUT_NDOF)
 		list(APPEND SRC
-			intern/GHOST_DisplayManagerCarbon.cpp
-			intern/GHOST_SystemCarbon.cpp
-			intern/GHOST_SystemPathsCarbon.cpp
-			intern/GHOST_WindowCarbon.cpp
-
-			intern/GHOST_DisplayManagerCarbon.h
-			intern/GHOST_SystemCarbon.h
-			intern/GHOST_SystemPathsCarbon.h
-			intern/GHOST_WindowCarbon.h
+			intern/GHOST_NDOFManagerCocoa.mm
+			intern/GHOST_NDOFManagerCocoa.h
+		)
+		list(APPEND SRC_NDOF3DCONNEXION
+			intern/GHOST_NDOFManager3Dconnexion.c
+			intern/GHOST_NDOFManager3Dconnexion.h
 		)
 	endif()
 
-- 
cgit v1.2.3