Revision: 41015
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41015
Author: jensverwiebe
Date: 2011-10-14 17:27:55 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
OSX: commit the needed steps for compiling with gcc 4.6.1 and OMP_NUM_THREADS
env variable setting
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/source/darwin/blender.app/Contents/Info.plist
Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py 2011-10-14 16:58:21 UTC
(rev 41014)
+++ trunk/blender/build_files/scons/tools/Blender.py 2011-10-14 17:27:55 UTC
(rev 41015)
@@ -582,6 +582,16 @@
commands.getoutput(cmd)
cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir,
binary)
commands.getoutput(cmd)
+ if env['CC'].endswith('4.6.1'): # for correct errorhandling with gcc 4.6.1
we need the gcc.dylib to link, thus distribute in app-bundle
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
+ commands.getoutput(cmd)
+ instname = env['BF_CXX']
+ cmd = 'cp %s/lib/libgcc_s.1.dylib
%s/%s.app/Contents/MacOS/lib/'%(instname, installdir, binary)
+ commands.getoutput(cmd)
+ cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib
%s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary)
+ commands.getoutput(cmd)
+ cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib
@executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname,
installdir, binary, binary)
+ commands.getoutput(cmd)
# extract copy system python, be sure to update other build systems
# when making changes to the files that are copied.
Modified: trunk/blender/source/darwin/blender.app/Contents/Info.plist
===================================================================
--- trunk/blender/source/darwin/blender.app/Contents/Info.plist 2011-10-14
16:58:21 UTC (rev 41014)
+++ trunk/blender/source/darwin/blender.app/Contents/Info.plist 2011-10-14
17:27:55 UTC (rev 41015)
@@ -1,33 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
-
<key>CFBundleExecutable</key>
<string>blender</string>
-
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
-
<key>CFBundleIconFile</key>
<string>blender icon.icns</string>
-
<key>CFBundleName</key>
<string>Blender</string>
<key>CFBundleIdentifier</key>
<string>org.blenderfoundation.blender</string>
-
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender
Foundation</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender
Foundation</string>
-
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -46,8 +40,13 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
- <true/>
+ <true/>
</dict>
</array>
+ <key>LSEnvironment</key>
+ <dict>
+ <key>OMP_NUM_THREADS</key>
+ <string>2</string>
+ </dict>
</dict>
</plist>
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
