diff options
Diffstat (limited to 'intern/ghost/CMakeLists.txt')
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 761bcb4dd27..d31e9472168 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -166,11 +166,6 @@ elseif(APPLE AND NOT WITH_X11) intern/GHOST_NDOFManagerCocoa.h ) - - list(APPEND SRC_NDOF3DCONNEXION - intern/GHOST_NDOFManager3Dconnexion.c - intern/GHOST_NDOFManager3Dconnexion.h - ) endif() if(WITH_CODEC_QUICKTIME) @@ -230,9 +225,9 @@ elseif(WITH_X11) if(WITH_INPUT_NDOF) list(APPEND SRC - intern/GHOST_NDOFManagerX11.cpp + intern/GHOST_NDOFManagerUnix.cpp - intern/GHOST_NDOFManagerX11.h + intern/GHOST_NDOFManagerUnix.h ) endif() @@ -315,8 +310,8 @@ if(APPLE) elseif(UNIX) list(APPEND SRC - intern/GHOST_SystemPathsX11.cpp - intern/GHOST_SystemPathsX11.h + intern/GHOST_SystemPathsUnix.cpp + intern/GHOST_SystemPathsUnix.h ) if(NOT WITH_INSTALL_PORTABLE) @@ -338,8 +333,3 @@ endif() add_definitions(${GL_DEFINITIONS}) blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}") - -# workaround for apple clang mangling extern "C" symbols -if(WITH_INPUT_NDOF AND APPLE) - blender_add_lib(bf_intern_ghostndof3dconnexion "${SRC_NDOF3DCONNEXION}" "${INC}" "${INC_SYS}") -endif() |