diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-24 00:40:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-12-26 00:26:40 +0100 |
| commit | 1e324c3cac09ac886293f755d0c1527ece2f5244 (patch) | |
| tree | 1d40934d1a21a6e467ae8126307c81752d86dbb8 | |
| parent | 41152314e0353afd2374bef31e5876096a6fcb29 (diff) | |
Configure with libfmt.
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | src/tools/wscript | 2 | ||||
| -rw-r--r-- | test/wscript | 2 | ||||
| -rw-r--r-- | wscript | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index dfe3ce487..17d05fe7e 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -247,7 +247,7 @@ def build(bld): BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT - LIBZ SQLITE3 + LIBZ SQLITE3 FMT """ if bld.env.TARGET_OSX: diff --git a/src/tools/wscript b/src/tools/wscript index e6d7c4be1..f58c7362c 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -98,7 +98,7 @@ def configure(conf): def build(bld): uselib = 'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB ' - uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT SQLITE3 ' + uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT SQLITE3 FMT ' if bld.env.ENABLE_DISK: if bld.env.TARGET_LINUX: diff --git a/test/wscript b/test/wscript index e32ec9acb..8e7d6530a 100644 --- a/test/wscript +++ b/test/wscript @@ -37,7 +37,7 @@ def build(bld): obj.name = 'unit-tests' 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 PNG JPEG ' - obj.uselib += 'LEQM_NRT ZIP SQLITE3 ' + obj.uselib += 'LEQM_NRT ZIP SQLITE3 FMT ' if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32: obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE ' if bld.env.TARGET_LINUX: @@ -644,6 +644,7 @@ def configure(conf): define_name="DCPOMATIC_HAVE_SQLITE3_PREPARE_V3", mandatory=False) + conf.check_cfg(package='fmt', args='--cflags --libs', uselib_store='FMT', mandatory=True) # Other stuff |