diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2011-10-27 19:50:51 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-10-27 19:50:51 +0400 |
| commit | 4ce5bb0ba2d0c3fb74bbd240d26f187aef5afb2e (patch) | |
| tree | 2b1731dd11714d1869d0dac761b70ca1aedb5944 | |
| parent | 7a20ced627115768ad94ab522fadd320f7a760c3 (diff) | |
OSX: adapt comments to new behaviour when compiling with gcc-4.6 but GHOST and QT with default compiler
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/quicktime/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index e6a29522e6d..68a0cbf7bdd 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -107,7 +107,7 @@ if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-v 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 +elif env['WITH_GHOST_COCOA']: # always use default-Apple-gcc 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', cxx_compilerchange='/usr/bin/g++' ) print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC" diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index 37f6474350b..db1d4a4f1ab 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', cxx_compilerchange='/usr/bin/g++') # 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', cxx_compilerchange='/usr/bin/g++') # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet else: env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities) |