[Bf-committers] unresolved subversion conflict in file blender/scons/scons-local-1.1.0/SCons/Tool/cc.py

[Dietrich Bollmann]

Hi,

I found an unresolved svn conflict in the blender repository:

#<<<<<<< .working
#
#    env['_CCCOMCOM'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS'
#    # It's a hack to test for darwin here, but the alternative of creating
#    # an applecc.py to contain this seems overkill.  Maybe someday the Apple
#    # platform will require more setup and this logic will be moved.
#    env['FRAMEWORKS'] = SCons.Util.CLVar('')
#    env['FRAMEWORKPATH'] = SCons.Util.CLVar('')
#    if env['PLATFORM'] == 'darwin':
#        env['_CCCOMCOM'] = env['_CCCOMCOM'] + ' $_FRAMEWORKPATH'
#=======
#>>>>>>> .merge-right.r1907

See file blender/scons/scons-local-1.1.0/SCons/Tool/cc.py
or online: https://svn.blender.org/svnroot/bf-blender/trunk/blender/scons/scons-local-1.1.0/SCons/Tool/cc.py

Cheers, 
Dietrich