diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/python/SConscript | |
parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/python/SConscript')
-rw-r--r-- | source/blender/python/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 21af50dbf10..ddb8594de79 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -31,7 +31,6 @@ Import ('env') incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes' incs += ' ../imbuf ../blenloader ../bmesh ../gpu ../render/extern/include ../windowmanager' -incs += ' ../freestyle/intern/python' incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] @@ -102,6 +101,10 @@ if env['WITH_BF_CYCLES']: if env['WITH_BF_CYCLES_OSL']: defs.append('WITH_CYCLES_OSL') +if env['WITH_BF_FREESTYLE']: + incs += ' ../freestyle/intern/python' + defs.append('WITH_FREESTYLE') + if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') |