forked from bartvdbraak/blender
libmv: don't replace flags with rel_flags but add, to preserve all flags
This commit is contained in:
parent
963f721128
commit
3a2cb0e3a8
12
extern/libmv/SConscript
vendored
12
extern/libmv/SConscript
vendored
@ -46,16 +46,16 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
|||||||
defs.append('NDEBUG')
|
defs.append('NDEBUG')
|
||||||
else:
|
else:
|
||||||
if not env['BF_DEBUG']:
|
if not env['BF_DEBUG']:
|
||||||
cflags_libmv = Split(env['REL_CFLAGS'])
|
cflags_libmv += Split(env['REL_CFLAGS'])
|
||||||
ccflags_libmv = Split(env['REL_CCFLAGS'])
|
ccflags_libmv += Split(env['REL_CCFLAGS'])
|
||||||
cxxflags_libmv = Split(env['REL_CXXFLAGS'])
|
cxxflags_libmv += Split(env['REL_CXXFLAGS'])
|
||||||
else:
|
else:
|
||||||
src += env.Glob("third_party/glog/src/*.cc")
|
src += env.Glob("third_party/glog/src/*.cc")
|
||||||
incs += ' ./third_party/glog/src'
|
incs += ' ./third_party/glog/src'
|
||||||
if not env['BF_DEBUG']:
|
if not env['BF_DEBUG']:
|
||||||
cflags_libmv = Split(env['REL_CFLAGS'])
|
cflags_libmv += Split(env['REL_CFLAGS'])
|
||||||
ccflags_libmv = Split(env['REL_CCFLAGS'])
|
ccflags_libmv += Split(env['REL_CCFLAGS'])
|
||||||
cxxflags_libmv = Split(env['REL_CXXFLAGS'])
|
cxxflags_libmv += Split(env['REL_CXXFLAGS'])
|
||||||
|
|
||||||
incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
|
incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user