Fixed CPPDEFINES only being set for dependant projects but not mijin itself.
This commit is contained in:
parent
4dfc116830
commit
d98e14285b
13
LibConf
13
LibConf
@ -15,19 +15,22 @@ mijin_sources = Split("""
|
|||||||
|
|
||||||
lib_libbacktrace = env.Cook('libbacktrace')
|
lib_libbacktrace = env.Cook('libbacktrace')
|
||||||
|
|
||||||
|
cppdefines = []
|
||||||
|
if env['BUILD_TYPE'] == 'debug':
|
||||||
|
cppdefines += ['MIJIN_DEBUG=1', 'MIJIN_CHECKED_ITERATORS=1']
|
||||||
|
|
||||||
|
|
||||||
lib_mijin = env.UnityStaticLibrary(
|
lib_mijin = env.UnityStaticLibrary(
|
||||||
target = env['LIB_DIR'] + '/mijin',
|
target = env['LIB_DIR'] + '/mijin',
|
||||||
source = mijin_sources,
|
source = mijin_sources,
|
||||||
dependencies = [lib_libbacktrace]
|
dependencies = [lib_libbacktrace],
|
||||||
|
CPPDEFINES = list(env['CPPDEFINES']) + cppdefines
|
||||||
)
|
)
|
||||||
|
|
||||||
LIB_CONFIG = {
|
LIB_CONFIG = {
|
||||||
'CPPPATH': [env.Dir('source')],
|
'CPPPATH': [env.Dir('source')],
|
||||||
'CPPDEFINES': [],
|
'CPPDEFINES': cppdefines,
|
||||||
'DEPENDENCIES': [lib_mijin]
|
'DEPENDENCIES': [lib_mijin]
|
||||||
}
|
}
|
||||||
|
|
||||||
if env['BUILD_TYPE'] == 'debug':
|
|
||||||
LIB_CONFIG['CPPDEFINES'].extend(['MIJIN_DEBUG=1', 'MIJIN_CHECKED_ITERATORS=1'])
|
|
||||||
|
|
||||||
Return('LIB_CONFIG')
|
Return('LIB_CONFIG')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user