[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61132] trunk/blender/intern/ghost/ CMakeLists.txt: OSX/cmake: ghost carbon removal

[jens verwiebe]

Revision: 61132
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61132
Author:   jensverwiebe
Date:     2013-11-05 14:09:17 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX/cmake: ghost carbon removal

Modified Paths:
--------------
    trunk/blender/intern/ghost/CMakeLists.txt

Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt	2013-11-05 14:05:37 UTC (rev 61131)
+++ trunk/blender/intern/ghost/CMakeLists.txt	2013-11-05 14:09:17 UTC (rev 61132)
@@ -131,17 +131,10 @@
 
 	# 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,42 +165,27 @@
 	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
+	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
-		)
+		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()
-
-	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()
 
 	if(WITH_CODEC_QUICKTIME)