diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2011-09-27 17:18:34 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-09-27 17:18:34 +0400 |
| commit | 6f2d937a63f9cda9c816b0eaa49458c18875c187 (patch) | |
| tree | 8fca68c3b393d3a33583086e633e5a80857213c6 /intern/ghost | |
| parent | 4b24951ff1660237bf26d13528f5b7f5f73becfa (diff) | |
OSX: introduced a workaround for compiling with non-apple gcc-4.6.1, ghost must be compiled with apple-gcc nevertheless due objc incompatibilities
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/SConscript | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 1bbc8398574..7869921ce02 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -100,6 +100,11 @@ if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-v incs = env['BF_WINTAB_INC'] + ' ' + incs 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') ) + env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') ) + +elif env['OURPLATFORM'] == 'darwin' and env['CC'].endswith('4.6.1'): # compile ghost always with apple-gcc to keep objectiveC compatibility + 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' ) #, cc_compileflags=env['CXXFLAGS'].append('-fobjc-exceptions') + print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC" + else: - env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) + env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) |