forked from bartvdbraak/blender
OSX: removing useless cocoa conditionals as it's solely api now
This commit is contained in:
parent
e83f169da1
commit
4df23896e5
@ -301,6 +301,6 @@ add_definitions(-DGLEW_STATIC)
|
|||||||
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
|
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
|
||||||
|
|
||||||
# workaround for apple clang mangling extern "C" symbols
|
# 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}")
|
blender_add_lib(bf_intern_ghostndof3dconnexion "${SRC_NDOF3DCONNEXION}" "${INC}" "${INC_SYS}")
|
||||||
endif()
|
endif()
|
||||||
|
@ -46,12 +46,8 @@
|
|||||||
# include "GHOST_SystemWin32.h"
|
# include "GHOST_SystemWin32.h"
|
||||||
#else
|
#else
|
||||||
# ifdef __APPLE__
|
# ifdef __APPLE__
|
||||||
# ifdef GHOST_COCOA
|
|
||||||
# include "GHOST_SystemCocoa.h"
|
# include "GHOST_SystemCocoa.h"
|
||||||
# else
|
# else
|
||||||
# include "GHOST_SystemCarbon.h"
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# include "GHOST_SystemX11.h"
|
# include "GHOST_SystemX11.h"
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
@ -72,11 +68,7 @@ GHOST_TSuccess GHOST_ISystem::createSystem()
|
|||||||
m_system = new GHOST_SystemWin32();
|
m_system = new GHOST_SystemWin32();
|
||||||
#else
|
#else
|
||||||
# ifdef __APPLE__
|
# ifdef __APPLE__
|
||||||
# ifdef GHOST_COCOA
|
|
||||||
m_system = new GHOST_SystemCocoa();
|
m_system = new GHOST_SystemCocoa();
|
||||||
# else
|
|
||||||
m_system = new GHOST_SystemCarbon();
|
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
m_system = new GHOST_SystemX11();
|
m_system = new GHOST_SystemX11();
|
||||||
# endif
|
# endif
|
||||||
|
@ -42,12 +42,8 @@
|
|||||||
# include "GHOST_SystemPathsWin32.h"
|
# include "GHOST_SystemPathsWin32.h"
|
||||||
#else
|
#else
|
||||||
# ifdef __APPLE__
|
# ifdef __APPLE__
|
||||||
# ifdef GHOST_COCOA
|
|
||||||
# include "GHOST_SystemPathsCocoa.h"
|
# include "GHOST_SystemPathsCocoa.h"
|
||||||
# else
|
# else
|
||||||
# include "GHOST_SystemPathsCarbon.h"
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# include "GHOST_SystemPathsX11.h"
|
# include "GHOST_SystemPathsX11.h"
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
@ -64,11 +60,7 @@ GHOST_TSuccess GHOST_ISystemPaths::create()
|
|||||||
m_systemPaths = new GHOST_SystemPathsWin32();
|
m_systemPaths = new GHOST_SystemPathsWin32();
|
||||||
#else
|
#else
|
||||||
# ifdef __APPLE__
|
# ifdef __APPLE__
|
||||||
# ifdef GHOST_COCOA
|
|
||||||
m_systemPaths = new GHOST_SystemPathsCocoa();
|
m_systemPaths = new GHOST_SystemPathsCocoa();
|
||||||
# else
|
|
||||||
m_systemPaths = new GHOST_SystemPathsCarbon();
|
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
m_systemPaths = new GHOST_SystemPathsX11();
|
m_systemPaths = new GHOST_SystemPathsX11();
|
||||||
# endif
|
# endif
|
||||||
|
Loading…
Reference in New Issue
Block a user