don't think this fix is correct, the endian test should not depend on the platform.
On Wed, Oct 5, 2011 at 7:58 PM, jens verwiebe <[email protected]> wrote: > Revision: 40800 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40800 > Author: jensverwiebe > Date: 2011-10-05 08:58:32 +0000 (Wed, 05 Oct 2011) > Log Message: > ----------- > OSX: Correct copy/paste error and exclude endianess switch from darwin > > Modified Paths: > -------------- > trunk/blender/SConstruct > trunk/blender/intern/ghost/SConscript > trunk/blender/source/blender/quicktime/SConscript > > Modified: trunk/blender/SConstruct > =================================================================== > --- trunk/blender/SConstruct 2011-10-05 07:57:33 UTC (rev 40799) > +++ trunk/blender/SConstruct 2011-10-05 08:58:32 UTC (rev 40800) > @@ -338,7 +338,7 @@ > env['CCFLAGS'].append('-DDISABLE_ELBEEM') > > > -if btools.ENDIAN == "big": > +if btools.ENDIAN == "big" and not env['OURPLATFORM']=='darwin': > env['CPPFLAGS'].append('-D__BIG_ENDIAN__') > env['CXXFLAGS'].append('-D__BIG_ENDIAN__') > env['CCFLAGS'].append('-D__BIG_ENDIAN__') > > Modified: trunk/blender/intern/ghost/SConscript > =================================================================== > --- trunk/blender/intern/ghost/SConscript 2011-10-05 07:57:33 UTC (rev > 40799) > +++ trunk/blender/intern/ghost/SConscript 2011-10-05 08:58:32 UTC (rev > 40800) > @@ -103,7 +103,7 @@ > env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, > libtype=['intern','player'], priority = [40,15]) #, > cc_compileflags=env['CCFLAGS'].append('/WX') ) > > elif env['WITH_GHOST_COCOA']: # always use Apple-gcc-4.2 for objC > language, for gnu-compilers do not support it fully yet > - env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, > libtype=['intern','player'], priority = [40,15], > cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2' ) > + env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, > libtype=['intern','player'], priority = [40,15], > cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/g++-4.2' ) > print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC" > > else: > > Modified: trunk/blender/source/blender/quicktime/SConscript > =================================================================== > --- trunk/blender/source/blender/quicktime/SConscript 2011-10-05 07:57:33 > UTC (rev 40799) > +++ trunk/blender/source/blender/quicktime/SConscript 2011-10-05 08:58:32 > UTC (rev 40800) > @@ -35,6 +35,6 @@ > > if env['WITH_GHOST_COCOA']: > defs.append('GHOST_COCOA') > - env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, > defines=defs, libtype=types, priority=priorities, > cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2') > # always use Apple-gcc-4.2 for objC language, for gnu-compilers do not > support it fully yet > + env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, > defines=defs, libtype=types, priority=priorities, > cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/g++-4.2') > # always use Apple-gcc-4.2 for objC language, for gnu-compilers do not > support it fully yet > else: > env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, > defines=defs, libtype=types, priority=priorities) > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > -- - Campbell _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
