diff options
author | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 21:39:41 +0300 |
---|---|---|
committer | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 21:39:41 +0300 |
commit | f2a8bb34989204dbdfee39cc6279808b5d5a8c9a (patch) | |
tree | df7bfbcac23d77e1d38c5c9a70ff9740c0028aec /intern/elbeem | |
parent | 7fe3ab7e8e23fb8750eead8f53802928b734821c (diff) |
this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit
Diffstat (limited to 'intern/elbeem')
-rw-r--r-- | intern/elbeem/SConscript | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index 0900ab1db5c..f0417f74001 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -5,14 +5,18 @@ Import('env') sources = env.Glob('intern/*.cpp') +incs = '' defs = 'NOGUI ELBEEM_BLENDER=1' if env['WITH_BF_OPENMP']: + if env['OURPLATFORM'] == 'linuxcross': + incs += ' ' + env['BF_OPENMP_INC'] + defs += ' PARALLEL' if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): defs += ' USE_MSVC6FIXES' -incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] +incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] incs += ' extern ' env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 ) |