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/makesdna/intern | |
| 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/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 1dd1d7e8f87..0632564b998 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -34,6 +34,9 @@ blender_include_dirs( .. ) +if(WITH_FREESTYLE) + add_definitions(-DWITH_FREESTYLE) +endif() # ----------------------------------------------------------------------------- # Build makesdna executable diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index add9611866d..8fd5b67c44b 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -39,6 +39,9 @@ root_build_dir=normpath(env['BF_BUILDDIR']) source_files = ['makesdna.c'] header_files = env.Glob('../*.h') +if env['WITH_BF_FREESTYLE']: + defines.append('WITH_FREESTYLE') + makesdna_tool = env.Clone() dna = env.Clone() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 12df9def368..b04052a98ef 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -133,8 +133,10 @@ static const char *includefiles[] = { "DNA_tracking_types.h", "DNA_dynamicpaint_types.h", "DNA_mask_types.h", +/* #ifdef WITH_FREESTYLE */ "DNA_freestyle_types.h", "DNA_linestyle_types.h", +/* #endif */ /* empty string to indicate end of includefiles */ "" @@ -1264,6 +1266,8 @@ int main(int argc, char **argv) #include "DNA_tracking_types.h" #include "DNA_dynamicpaint_types.h" #include "DNA_mask_types.h" +/* #ifdef WITH_FREESTYLE */ #include "DNA_freestyle_types.h" #include "DNA_linestyle_types.h" +/* #endif */ /* end of list */ |