diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-02-03 23:27:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-02-03 23:27:27 +0100 |
| commit | 1a54e2ed39606f41e627d4ad4af3b23167e94a05 (patch) | |
| tree | 744b1c8021c2400283980dee71baa4058422758d | |
| parent | d01558e96088172561ef31873f0e97a098bd4998 (diff) | |
Try to use backtrace.
| -rw-r--r-- | src/tools/wscript | 4 | ||||
| -rw-r--r-- | test/wscript | 4 | ||||
| -rw-r--r-- | wscript | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index ad8d00c25..664006f3b 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -33,10 +33,10 @@ def build(bld): uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG ' if bld.env.TARGET_WINDOWS: - uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER ' + uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER BACKTRACE DL ' if bld.env.TARGET_LINUX: - uselib += 'DL' + uselib += 'BACKTRACE DL ' cli_tools = [] if bld.env.VARIANT == 'swaroop-theater': diff --git a/test/wscript b/test/wscript index 71990c927..6c98948b1 100644 --- a/test/wscript +++ b/test/wscript @@ -38,9 +38,9 @@ def build(bld): obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE MAGICK PNG ' if bld.env.TARGET_WINDOWS: - obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE ' + obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE BACKTRACE DL ' if bld.env.TARGET_LINUX: - obj.uselib += 'DL ' + obj.uselib += 'BACKTRACE DL ' obj.use = 'libdcpomatic2' obj.source = """ 4k_test.cc @@ -181,6 +181,9 @@ def configure(conf): libpath='/usr/local/lib', lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_LOCALE') + conf.env.append_value('CXXFLAGS', ['-DBOOST_STACKTRACE_LINK', '-DBOOST_STACKTRACE_USE_BACKTRACE']) + conf.check(lib='dl', uselib_store='DL', msg="Checking for library dl") + conf.check(lib='backtrace', uselib_store='BACKTRACE', msg="Checking for library backtrace") # POSIX if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: @@ -196,7 +199,9 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align']) + conf.env.append_value('CXXFLAGS', '-DBOOST_STACKTRACE_USE_BACKTRACE') conf.check(lib='dl', uselib_store='DL', msg="Checking for library dl") + conf.check(lib='backtrace', uselib_store='BACKTRACE', msg="Checking for library backtrace") if not conf.env.DISABLE_GUI: conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) |