[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56574] trunk/blender/source/blender: fix for recent commit, WITH_GUARDEDALLOC wasn't enabled for makesrna, makesdna.

[Campbell Barton]

Revision: 56574
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56574
Author:   campbellbarton
Date:     2013-05-08 13:19:55 +0000 (Wed, 08 May 2013)
Log Message:
-----------
fix for recent commit, WITH_GUARDEDALLOC wasn't enabled for makesrna, makesdna.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
    trunk/blender/source/blender/makesdna/intern/SConscript
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/SConscript

Modified: trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesdna/intern/CMakeLists.txt	2013-05-08 13:16:45 UTC (rev 56573)
+++ trunk/blender/source/blender/makesdna/intern/CMakeLists.txt	2013-05-08 13:19:55 UTC (rev 56574)
@@ -50,6 +50,11 @@
 
 # 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

Modified: trunk/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/intern/SConscript	2013-05-08 13:16:45 UTC (rev 56573)
+++ trunk/blender/source/blender/makesdna/intern/SConscript	2013-05-08 13:19:55 UTC (rev 56574)
@@ -36,6 +36,8 @@
 defines = []
 root_build_dir=normpath(env['BF_BUILDDIR'])
 
+defines.append('WITH_GUARDEDALLOC')
+
 source_files = ['makesdna.c']
 header_files = env.Glob('../*.h')
 

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-05-08 13:16:45 UTC (rev 56573)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-05-08 13:19:55 UTC (rev 56574)
@@ -247,6 +247,11 @@
 	add_definitions(-DWITH_BULLET)
 endif()
 
+# for mallocn.c
+if (WITH_GUARDEDALLOC)
+	add_definitions(-DWITH_GUARDEDALLOC)
+endif()
+
 # Build makesrna executable
 blender_include_dirs(
 	.

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2013-05-08 13:16:45 UTC (rev 56573)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2013-05-08 13:19:55 UTC (rev 56574)
@@ -145,6 +145,7 @@
 if not env['BF_DEBUG']:
     defs.append('NDEBUG')
 
+defs.append('WITH_GUARDEDALLOC')
 
 makesrna_tool.Append(CPPDEFINES=defs)