kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OSX/ndof: rollback 52072, test showed we need individually weak functions -> todo: solve the clang link issue other way

Browse Source
This commit is contained in:
Jens Verwiebe 2012-11-10 15:13:41 +00:00
parent 5ddc5fbfb3
commit 45cd54bcd1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
View File

@ -168,7 +168,7 @@ GHOST_NDOFManagerCocoa::~GHOST_NDOFManagerCocoa()
extern "C" { extern "C" {
bool GHOST_NDOFManagerCocoa::available() 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) // 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 // http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
return InstallConnexionHandlers != NULL; return InstallConnexionHandlers != NULL;
@ -177,7 +177,7 @@ extern "C" {
bool GHOST_NDOFManagerCocoa::oldDRV() 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) // 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 // http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
return SetConnexionClientButtonMask != NULL; return SetConnexionClientButtonMask != NULL;