Revision: 37913
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37913
Author: merwin
Date: 2011-06-28 15:57:39 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
made Pascal string less intrusive to build systems
Modified Paths:
--------------
branches/merwin-spacenav/build_files/scons/config/darwin-config.py
branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
Modified: branches/merwin-spacenav/build_files/scons/config/darwin-config.py
===================================================================
--- branches/merwin-spacenav/build_files/scons/config/darwin-config.py
2011-06-28 15:50:50 UTC (rev 37912)
+++ branches/merwin-spacenav/build_files/scons/config/darwin-config.py
2011-06-28 15:57:39 UTC (rev 37913)
@@ -298,7 +298,6 @@
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']
Modified: branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
===================================================================
--- branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
2011-06-28 15:50:50 UTC (rev 37912)
+++ branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
2011-06-28 15:57:39 UTC (rev 37913)
@@ -131,7 +131,7 @@
}
// 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs