OSX: removing useless cocoa conditionals as it's solely api now
authorJens Verwiebe <info@jensverwiebe.de>
Tue, 5 Nov 2013 14:35:09 +0000 (14:35 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Tue, 5 Nov 2013 14:35:09 +0000 (14:35 +0000)
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_ISystem.cpp
intern/ghost/intern/GHOST_ISystemPaths.cpp

index 15ee264..f4faa6e 100644 (file)
@@ -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()
index f6973ca..009753c 100644 (file)
 #  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
index ae9a8e4..581467f 100644 (file)
 #  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