← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to build_files/scons/tools/Blender.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build_files/scons/tools/Blender.py
151
151
        libincs += Split(lenv['BF_JACK_LIBPATH'])
152
152
    if lenv['WITH_BF_SNDFILE']:
153
153
        libincs += Split(lenv['BF_SNDFILE_LIBPATH'])
154
 
    if lenv['WITH_BF_OPENEXR']:
155
 
        libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
156
 
        if lenv['WITH_BF_STATICOPENEXR']:
157
 
            statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
158
 
    if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
159
 
        statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
160
154
    if lenv['WITH_BF_TIFF']:
161
155
        libincs += Split(lenv['BF_TIFF_LIBPATH'])
162
156
        if lenv['WITH_BF_STATICTIFF']:
212
206
        libincs += Split(lenv['BF_OIIO_LIBPATH'])
213
207
        if lenv['WITH_BF_STATICOIIO']:
214
208
            statlibs += Split(lenv['BF_OIIO_LIB_STATIC'])
 
209
    if lenv['WITH_BF_OPENEXR']:
 
210
        libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
 
211
        if lenv['WITH_BF_STATICOPENEXR']:
 
212
            statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
 
213
    if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
 
214
        statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
215
215
 
216
216
    if lenv['WITH_BF_OCIO']:
217
217
        libincs += Split(lenv['BF_OCIO_LIBPATH'])
683
683
    commands.getoutput(cmd)
684
684
    cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary)
685
685
    commands.getoutput(cmd)
686
 
    if env['CC'][:-2].endswith('4.6'): # for correct errorhandling with gcc 4.6.x we need the gcc.dylib to link, thus distribute in app-bundle
 
686
    if env['CC'][:-2].endswith('4.6') or env['CC'][:-2].endswith('4.8'): # for correct errorhandling with gcc 4.6/4.8.x we need the gcc.dylib and gomp.dylib to link, thus distribute in app-bundle
687
687
        cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
688
688
        commands.getoutput(cmd)
689
689
        instname = env['BF_CXX']
690
 
        cmd = 'ditto --arch %s %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/'%(osxarch, instname, installdir, binary)
691
 
        commands.getoutput(cmd)
692
 
        cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary)
693
 
        commands.getoutput(cmd)
694
 
        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)
 
690
        cmd = 'ditto --arch %s %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/'%(osxarch, instname, installdir, binary) # copy libgcc
 
691
        commands.getoutput(cmd)
 
692
        cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary) # change id of libgcc
 
693
        commands.getoutput(cmd)
 
694
        cmd = 'ditto --arch %s %s/lib/libgomp.1.dylib %s/%s.app/Contents/MacOS/lib/'%(osxarch, instname, installdir, binary) # copy libgomp
 
695
        commands.getoutput(cmd)
 
696
        cmd = 'install_name_tool -id @executable_path/lib/libgomp.1.dylib %s/%s.app/Contents/MacOS/lib/libgomp.1.dylib'%(installdir, binary) # change id of libgomp
 
697
        commands.getoutput(cmd)
 
698
        cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib  @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgomp.1.dylib'%(instname, installdir, binary) # change ref to libgcc
 
699
        commands.getoutput(cmd)
 
700
        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) # change ref to libgcc ( blender )
 
701
        commands.getoutput(cmd)
 
702
        cmd = 'install_name_tool -change %s/lib/libgomp.1.dylib  @executable_path/lib/libgomp.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary) # change ref to libgomp ( blender )
695
703
        commands.getoutput(cmd)
696
704
 
697
705
# extract copy system python, be sure to update other build systems