[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60112] trunk/blender: OSX: Compilefix for ndof symbols get magled when used extern C, now use discrete c files embedded, patch by Jake Kauth
jens verwiebe
info at jensverwiebe.de
Fri Sep 13 17:18:17 CEST 2013
Revision: 60112
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60112
Author: jensverwiebe
Date: 2013-09-13 15:18:17 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
OSX: Compilefix for ndof symbols get magled when used extern C, now use discrete c files embedded, patch by Jake Kauth
Modified Paths:
--------------
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/ghost/SConscript
trunk/blender/intern/ghost/intern/GHOST_NDOFManager.h
trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/source/creator/CMakeLists.txt
Added Paths:
-----------
trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2013-09-13 14:57:57 UTC (rev 60111)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2013-09-13 15:18:17 UTC (rev 60112)
@@ -191,6 +191,10 @@
intern/GHOST_NDOFManagerCocoa.mm
intern/GHOST_NDOFManagerCocoa.h
)
+ list(APPEND SRC2
+ intern/GHOST_NDOFManager3Dconnexion.c
+ intern/GHOST_NDOFManager3Dconnexion.h
+ )
endif()
else()
@@ -318,4 +322,6 @@
add_definitions(-DGLEW_STATIC)
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
-
+if(WITH_INPUT_NDOF)
+blender_add_lib(bf_intern_ghostndof3dconnexion "${SRC2}" "${INC}" "${INC_SYS}")
+endif()
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2013-09-13 14:57:57 UTC (rev 60111)
+++ trunk/blender/intern/ghost/SConscript 2013-09-13 15:18:17 UTC (rev 60112)
@@ -33,6 +33,7 @@
window_system = env['OURPLATFORM']
sources = env.Glob('intern/*.cpp')
+sources2 = env.Glob('intern/GHOST_NDOFManager3Dconnexion.c')
if window_system == 'darwin':
sources += env.Glob('intern/*.mm')
@@ -156,6 +157,7 @@
elif env['WITH_GHOST_COCOA']: # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
+ env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
else:
Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManager.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManager.h 2013-09-13 14:57:57 UTC (rev 60111)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManager.h 2013-09-13 15:18:17 UTC (rev 60112)
@@ -109,10 +109,6 @@
virtual ~GHOST_NDOFManager() {}
- // whether multi-axis functionality is available (via the OS or driver)
- // does not imply that a device is plugged in or being used
- virtual bool available() = 0;
-
// each platform's device detection should call this
// use standard USB/HID identifiers
bool setDevice(unsigned short vendor_id, unsigned short product_id);
Added: trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c (rev 0)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c 2013-09-13 15:18:17 UTC (rev 60112)
@@ -0,0 +1,83 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s):
+ * Jake Kauth on 9/12/13.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifdef WITH_INPUT_NDOF
+
+#include <ConnexionClientAPI.h>
+#include <stdio.h>
+
+#include "GHOST_NDOFManager3Dconnexion.h"
+
+/* It is to be noted that these implementations are linked in as
+ * 'extern "C"' calls from GHOST_NDOFManagerCocoa.
+
+ * This is done in order to
+ * preserve weak linking capability (which as of clang-3.3 and xcode5
+ * breaks weak linking when there is name mangling of c++ libraries.)
+ *
+ * We need to have the weak linked file as pure C. Therefore we build a
+ * compiled bridge from the real weak linked calls and the calls within C++
+
+ */
+
+OSErr GHOST_NDOFManager3Dconnexion_available(void)
+{
+ // extern unsigned int InstallConnexionHandlers() __attribute__((weak_import));
+ // Make the linker happy for the framework check (see link below for more info)
+ // http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
+ return InstallConnexionHandlers != 0;
+ // this means that the driver is installed and dynamically linked to blender
+}
+
+OSErr GHOST_NDOFManager3Dconnexion_oldDRV()
+{
+ //extern unsigned int SetConnexionClientButtonMask() __attribute__((weak_import));
+ // Make the linker happy for the framework check (see link below for more info)
+ // http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
+ return SetConnexionClientButtonMask != 0;
+ // this means that the driver has this symbol
+}
+
+UInt16 GHOST_NDOFManager3Dconnexion_RegisterConnexionClient (UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask) {
+ return RegisterConnexionClient(signature, name, mode, mask);
+};
+void GHOST_NDOFManager3Dconnexion_SetConnexionClientButtonMask (UInt16 clientID, UInt32 buttonMask){
+ return SetConnexionClientButtonMask( clientID, buttonMask);
+};
+void GHOST_NDOFManager3Dconnexion_UnregisterConnexionClient (UInt16 clientID){
+ return UnregisterConnexionClient( clientID);
+};
+OSErr GHOST_NDOFManager3Dconnexion_InstallConnexionHandlers (ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler){
+ return InstallConnexionHandlers( messageHandler, addedHandler, removedHandler);
+
+
+};
+void GHOST_NDOFManager3Dconnexion_CleanupConnexionHandlers (void){
+ return CleanupConnexionHandlers();
+};
+OSErr GHOST_NDOFManager3Dconnexion_ConnexionControl(UInt32 message, SInt32 param, SInt32 *result){
+return ConnexionControl( message, param, result);
+}
+
+
+#endif // WITH_INPUT_NDOF
Added: trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h (rev 0)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h 2013-09-13 15:18:17 UTC (rev 60112)
@@ -0,0 +1,50 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s):
+ * Jake Kauth on 9/12/13.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __GHOST_NDOFMANAGER3DCONNEXION_H__
+#define __GHOST_NDOFMANAGER3DCONNEXION_H__
+
+#ifdef WITH_INPUT_NDOF
+#include <ConnexionClientAPI.h>
+
+
+OSErr GHOST_NDOFManager3Dconnexion_available(void);
+OSErr GHOST_NDOFManager3Dconnexion_oldDRV(void);
+OSErr GHOST_NDOFManager3Dconnexion_InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler);
+void GHOST_NDOFManager3Dconnexion_CleanupConnexionHandlers(void);
+UInt16 GHOST_NDOFManager3Dconnexion_RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask);
+void GHOST_NDOFManager3Dconnexion_SetConnexionClientButtonMask(UInt16 clientID, UInt32 buttonMask);
+void GHOST_NDOFManager3Dconnexion_UnregisterConnexionClient(UInt16 clientID);
+OSErr GHOST_NDOFManager3Dconnexion_ConnexionControl(UInt32 message, SInt32 param, SInt32 *result);
+
+extern OSErr InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler) __attribute__((weak_import));
+extern void CleanupConnexionHandlers(void) __attribute__((weak_import));
+extern UInt16 RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask) __attribute__((weak_import));
+extern void SetConnexionClientButtonMask(UInt16 clientID, UInt32 buttonMask) __attribute__((weak_import));
+extern void UnregisterConnexionClient(UInt16 clientID) __attribute__((weak_import));
+extern OSErr ConnexionControl(UInt32 message, SInt32 param, SInt32 *result) __attribute__((weak_import));
+
+
+#endif // WITH_INPUT_NDOF
+
+#endif // #include guard
Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.h 2013-09-13 14:57:57 UTC (rev 60111)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.h 2013-09-13 15:18:17 UTC (rev 60112)
@@ -26,7 +26,22 @@
#ifdef WITH_INPUT_NDOF
+
+extern "C" {
+#include <ConnexionClientAPI.h>
+#include <stdio.h>
+}
+
+
#include "GHOST_NDOFManager.h"
+extern "C" OSErr GHOST_NDOFManager3Dconnexion_available(void);
+extern "C" OSErr GHOST_NDOFManager3Dconnexion_oldDRV(void);
+extern "C" OSErr GHOST_NDOFManager3Dconnexion_InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler);
+extern "C" void GHOST_NDOFManager3Dconnexion_CleanupConnexionHandlers(void);
+extern "C" UInt16 GHOST_NDOFManager3Dconnexion_RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list