[Bf-committers] unresolved subversion conflict in file blender/scons/scons-local-1.1.0/SCons/Tool/cc.py
jesterking at letwory.net
Thu Nov 13 14:41:47 CET 2008
That's not really an unresolved conflict, since it has been commented
out. If it were one, it would start at the beginning of the respective
On Thu, Nov 13, 2008 at 1:22 PM, Dietrich Bollmann <diresu at web.de> wrote:
> 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
> Bf-committers mailing list
> Bf-committers at blender.org
More information about the Bf-committers