diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-28 22:04:07 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-28 22:04:07 +0400 |
| commit | 8fce915b6e6b008e89696c7ff96355d9a1f2ccf1 (patch) | |
| tree | aca31a5dfd6f3368586dea746296a428b53ff75a /source/blender/collada | |
| parent | 32ec0c762e9f19754e1176a177bedfcb74c74786 (diff) | |
scon update for new collada libraries
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/SConscript | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index e1ab774ffbe..38ffa471070 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -47,22 +47,13 @@ incs = [ '../bmesh', '#/intern/guardedalloc', ] -if env['OURPLATFORM']=='darwin': - incs += [ - env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter', - env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils', - env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework', - env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader', - env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser', - ] -else: - incs += [ - env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter/include', - env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils/include', - env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework/include', - env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader/include', - env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser/include', - ] +incs += [ + env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter', + env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils', + env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework', + env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader', + env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser', +] if env['BF_BUILDINFO']: defs.append('WITH_BUILDINFO') |