From 29740cf80c39125625b438bff8b1bc2f0d979b40 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 26 Jan 2016 03:45:07 +0000 Subject: [PATCH] Move memdebug cpp processing to sconf --- SConstruct | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 86ba3b9df..57d26a642 100644 --- a/SConstruct +++ b/SConstruct @@ -749,6 +749,9 @@ int main(int argc,char**argv){(void)argc;(void)argv; def _check_user_settings_debug(self,context,_CPPDEFINES=(('NDEBUG',), ('RELEASE',))): self._result_check_user_setting(context, not self.user_settings.debug, _CPPDEFINES, 'release options') @_custom_test + def _check_user_settings_memdebug(self,context,_CPPDEFINES=(('DEBUG_MEMORY_ALLOCATIONS',),)): + self._result_check_user_setting(context, self.user_settings.memdebug, _CPPDEFINES, 'memory allocation tracking') + @_custom_test def check_libphysfs(self,context,_header=('physfs.h',)): main = ''' PHYSFS_File *f; @@ -2999,10 +3002,6 @@ class DXXCommon(LazyObjectConstructor): user_settings = self.user_settings env.Prepend(CXXFLAGS = ['-g', '-O2']) - if user_settings.memdebug: - message(self, "including: MEMDEBUG") - add_cpp_define('DEBUG_MEMORY_ALLOCATIONS') - #editor build? if user_settings.editor: add_cpp_define('EDITOR')