[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52076] trunk/blender/intern/ghost/intern/ GHOST_NDOFManagerCocoa.mm: OSX/ndof: rollback 52072, test showed we need individually weak functions -> todo: solve the clang link issue other way
jens verwiebe
info at jensverwiebe.de
Sat Nov 10 16:13:45 CET 2012
Revision: 52076
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52076
Author: jensverwiebe
Date: 2012-11-10 15:13:41 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
OSX/ndof: rollback 52072, test showed we need individually weak functions -> todo: solve the clang link issue other way
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm 2012-11-10 14:50:34 UTC (rev 52075)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm 2012-11-10 15:13:41 UTC (rev 52076)
@@ -168,7 +168,7 @@
extern "C" {
bool GHOST_NDOFManagerCocoa::available()
{
- extern OSErr InstallConnexionHandlers(); // (testing whole framework weak) __attribute__((weak_import));
+ extern OSErr 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 != NULL;
@@ -177,7 +177,7 @@
bool GHOST_NDOFManagerCocoa::oldDRV()
{
- extern OSErr SetConnexionClientButtonMask(); // (testing whole framework weak) __attribute__((weak_import));
+ extern OSErr 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 != NULL;
More information about the Bf-blender-cvs
mailing list