diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-22 21:35:53 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-22 21:35:53 +0400 |
commit | 9f764e3aa7281af4f6f241ac452dd1e6ebb08c96 (patch) | |
tree | d7aaa21426280595a20636f2d5e6de992ad55894 | |
parent | 5f830a0863e085c3e37d3a5682e86ebbe1e06801 (diff) |
Workaround for compilation error introduced in r54755
Scons used to fail because of couple of reasons:
- CMake does have WITH_DNA_GHASH enabled, Scons not
Which is a good question why?!
- This makes Cmake including BLI_utildefines in dna_genfile.c,
but scons missed this include
- This damn "bool" thing requires BLI_utildefines
And last question here is why would we want to use bool here =\
It's just always ends up in headache without any visible benefit
of using it.
Well, at least now svn shall be compilable again..
-rw-r--r-- | source/blender/makesdna/SConscript | 2 | ||||
-rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript index a6520a6c03e..701ad12f2b8 100644 --- a/source/blender/makesdna/SConscript +++ b/source/blender/makesdna/SConscript @@ -32,6 +32,6 @@ objs = [] o = SConscript('intern/SConscript') objs += o -incs = '#/intern/guardedalloc .' +incs = '#/intern/guardedalloc . ../blenlib' env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215,200] ) diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 27520a746be..86014c4e80e 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -42,8 +42,9 @@ #include "MEM_guardedalloc.h" // for MEM_freeN MEM_mallocN MEM_callocN +#include "BLI_utildefines.h" + #ifdef WITH_DNA_GHASH -# include "BLI_utildefines.h" # include "BLI_ghash.h" #endif |