← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to tools/Blender.py

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/Blender.py
142
142
        lenv['BF_PNG_LIB'],
143
143
        lenv['BF_ZLIB_LIB']
144
144
        ]
145
 
    if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
 
145
    if lenv['BF_DEBUG']==1 and lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
146
146
        syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
147
147
    else:
148
148
        syslibs.append(lenv['BF_PYTHON_LIB'])
387
387
            lenv.Append(CPPDEFINES=defines)
388
388
            if lenv['WITH_BF_GAMEENGINE']:
389
389
                    lenv.Append(CPPDEFINES=['GAMEBLENDER=1'])
 
390
            # debug or not
 
391
            # CXXFLAGS defaults to CCFLAGS, therefore
 
392
            #  we Replace() rather than Append() to CXXFLAGS the first time
390
393
            if lenv['BF_DEBUG'] or (libname in quickdebug):
391
 
                    lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_FLAGS']), CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS']))
 
394
                    lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_FLAGS']))
 
395
                    lenv.Replace( CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS']))
392
396
            else:
393
 
                    lenv.Append(CCFLAGS = lenv['REL_CFLAGS'], CXXFLAGS = lenv['REL_CCFLAGS'])
 
397
                    lenv.Append(CCFLAGS = lenv['REL_CFLAGS'])
 
398
                    lenv.Replace(CXXFLAGS = lenv['REL_CCFLAGS'])
394
399
            if lenv['BF_PROFILE']:
395
 
                    lenv.Append(CCFLAGS = Split(lenv['BF_PROFILE_FLAGS']), CXXFLAGS = Split(lenv['BF_PROFILE_FLAGS']))
 
400
                    lenv.Append(CCFLAGS = Split(lenv['BF_PROFILE_FLAGS']),
 
401
                                CXXFLAGS = Split(lenv['BF_PROFILE_FLAGS']))
396
402
            if compileflags:
397
403
                lenv.Append(CCFLAGS = compileflags)
398
404
                lenv.Append(CXXFLAGS = compileflags)