diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/quicktime/SConscript | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index eacf18266f0..b2affe1b6b7 100644 --- a/SConstruct +++ b/SConstruct @@ -338,7 +338,7 @@ if env['BF_NO_ELBEEM'] == 1: 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__') diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 0c3109b1482..9977a7927fc 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -103,7 +103,7 @@ if window_system in ('win32-vc', 'win64-vc'): 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: diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index 82735dc96bd..a128ded965c 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -35,6 +35,6 @@ defs=['WITH_QUICKTIME'] 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) |