[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61133] trunk/blender/intern/ghost: OSX: removing useless cocoa conditionals as it's solely api now

[jens verwiebe]

Revision: 61133
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61133
Author:   jensverwiebe
Date:     2013-11-05 14:35:09 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX: removing useless cocoa conditionals as it's solely api now

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

Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt	2013-11-05 14:09:17 UTC (rev 61132)
+++ trunk/blender/intern/ghost/CMakeLists.txt	2013-11-05 14:35:09 UTC (rev 61133)
@@ -301,6 +301,6 @@
 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()

Modified: trunk/blender/intern/ghost/intern/GHOST_ISystem.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_ISystem.cpp	2013-11-05 14:09:17 UTC (rev 61132)
+++ trunk/blender/intern/ghost/intern/GHOST_ISystem.cpp	2013-11-05 14:35:09 UTC (rev 61133)
@@ -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 @@
 		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

Modified: trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp	2013-11-05 14:09:17 UTC (rev 61132)
+++ trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp	2013-11-05 14:35:09 UTC (rev 61133)
@@ -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 @@
 		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