diff options
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 1 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 231525993e1..ca99357330f 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -298,7 +298,6 @@ if WITH_BF_QUICKTIME == True: if WITH_BF_SPACENAV: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient'] - CXXFLAGS = CXXFLAGS + ['-fpascal-strings'] # they use an old-skool Mac programming style #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 LLIBS = ['stdc++', 'SystemStubs'] diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm index e32c21eab15..826d0c6b319 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm @@ -131,7 +131,7 @@ GHOST_NDOFManagerCocoa::GHOST_NDOFManagerCocoa(GHOST_System& sys) } // Pascal string *and* a four-letter constant. How old-skool. - m_clientID = RegisterConnexionClient('blnd', (UInt8*) "\pblender", + m_clientID = RegisterConnexionClient('blnd', (UInt8*) "\007blender", kConnexionClientModeTakeOver, kConnexionMaskAll); printf("ndof: client id = %d\n", m_clientID); |