fix for recent commit, WITH_GUARDEDALLOC wasn't enabled for makesrna, makesdna.

4 files changed, 13 insertions, 0 deletions

diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 1dd1d7e8f87..0bd53ec8765 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -50,6 +50,11 @@ endif()
 
 # SRC_DNA_INC is defined in the parent dir
 
+# for mallocn.c
+if (WITH_GUARDEDALLOC)
+	add_definitions(-DWITH_GUARDEDALLOC)
+endif()
+
 add_executable(makesdna ${SRC} ${SRC_DNA_INC})
 
 # Output dna.c
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index add9611866d..3dada5f0a44 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -36,6 +36,8 @@ cflags = ''
 defines = []
 root_build_dir=normpath(env['BF_BUILDDIR'])
 
+defines.append('WITH_GUARDEDALLOC')
+
 source_files = ['makesdna.c']
 header_files = env.Glob('../*.h')
 
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 609592cc1cd..2e0eacf90e5 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -247,6 +247,11 @@ if(WITH_BULLET)
 	add_definitions(-DWITH_BULLET)
 endif()
 
+# for mallocn.c
+if (WITH_GUARDEDALLOC)
+	add_definitions(-DWITH_GUARDEDALLOC)
+endif()
+
 # Build makesrna executable
 blender_include_dirs(
 	.
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 910cf8385f5..98f82ee7909 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -145,6 +145,7 @@ if env['WITH_BF_FREESTYLE']:
 if not env['BF_DEBUG']:
     defs.append('NDEBUG')
 
+defs.append('WITH_GUARDEDALLOC')
 
 makesrna_tool.Append(CPPDEFINES=defs)