From 9f764e3aa7281af4f6f241ac452dd1e6ebb08c96 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 22 Feb 2013 17:35:53 +0000 Subject: 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.. --- source/blender/makesdna/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesdna/SConscript') 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] ) -- cgit v1.2.3