diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-03-25 12:29:06 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-03-25 12:29:06 +0400 |
| commit | 69265961749780e252e144d1f815c0fdda435b8a (patch) | |
| tree | afe54648b63dc0f9746d38cff81de247ca0ddf98 /source/blender/collada/SConscript | |
| parent | 1b4c9e1ad40142fbf6a2d97303661a78527c134b (diff) | |
More new data names translation (most cases should be covered now).
Also done a few cleanup here and there...
Diffstat (limited to 'source/blender/collada/SConscript')
| -rw-r--r-- | source/blender/collada/SConscript | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index 4da99a21517..e1ab774ffbe 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -32,12 +32,42 @@ defs = [] # TODO sanitize inc path building # relative paths to include dirs, space-separated, string +incs = [ + '../ikplugin', + '#/intern/iksolver/extern', + '../blenlib', + '../blenfont', + '../blenkernel', + '../windowmanager', + '../blenloader', + '../makesdna', + '../makesrna', + '../editors/include', + '../imbuf', + '../bmesh', + '#/intern/guardedalloc', +] if env['OURPLATFORM']=='darwin': - incs = '../ikplugin ../../../intern/iksolver/extern ../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../imbuf ../bmesh ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + 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 = '../ikplugin ../../../intern/iksolver/extern ../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../imbuf ../bmesh ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + 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', + ] if env['BF_BUILDINFO']: defs.append('WITH_BUILDINFO') -env.BlenderLib ('bf_collada', sources, Split(incs), defs, libtype='core', priority=200 ) +if env['WITH_BF_INTERNATIONAL']: + defs.append('WITH_INTERNATIONAL') + +env.BlenderLib ('bf_collada', sources, incs, defs, libtype='core', priority=200 ) |