From d98e14285baf45772a411e3116bfdfea3c3905b7 Mon Sep 17 00:00:00 2001 From: Patrick Wuttke Date: Sat, 18 Nov 2023 22:19:52 +0100 Subject: [PATCH] Fixed CPPDEFINES only being set for dependant projects but not mijin itself. --- LibConf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/LibConf b/LibConf index c4e55eb..113fb09 100644 --- a/LibConf +++ b/LibConf @@ -15,19 +15,22 @@ mijin_sources = Split(""" lib_libbacktrace = env.Cook('libbacktrace') +cppdefines = [] +if env['BUILD_TYPE'] == 'debug': + cppdefines += ['MIJIN_DEBUG=1', 'MIJIN_CHECKED_ITERATORS=1'] + + lib_mijin = env.UnityStaticLibrary( target = env['LIB_DIR'] + '/mijin', source = mijin_sources, - dependencies = [lib_libbacktrace] + dependencies = [lib_libbacktrace], + CPPDEFINES = list(env['CPPDEFINES']) + cppdefines ) LIB_CONFIG = { 'CPPPATH': [env.Dir('source')], - 'CPPDEFINES': [], + 'CPPDEFINES': cppdefines, 'DEPENDENCIES': [lib_mijin] } -if env['BUILD_TYPE'] == 'debug': - LIB_CONFIG['CPPDEFINES'].extend(['MIJIN_DEBUG=1', 'MIJIN_CHECKED_ITERATORS=1']) - Return('LIB_CONFIG')