diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-21 03:14:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-21 03:14:10 +0100 |
| commit | d7c2644cfd074bb46922c1976044312ad07be1c7 (patch) | |
| tree | e8278517860ad78d4ddb38377d2a0c16ec8e8bff /src/lib | |
| parent | b6dc9aed0dcb5928d0f34e5db68b0c98b48c6b6e (diff) | |
Add versioning; tweak libdcp version reporting; make makedcp more useful for testing.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/util.cc | 4 | ||||
| -rw-r--r-- | src/lib/version.h | 3 | ||||
| -rw-r--r-- | src/lib/wscript | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 92861739c..7c80ca3c9 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -35,6 +35,7 @@ #include <magick/MagickCore.h> #include <magick/version.h> #include <libssh/libssh.h> +#include <libdcp/version.h> extern "C" { #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> @@ -269,7 +270,8 @@ dependency_version_summary () << "libpostproc " << ffmpeg_version_to_string (postproc_version()) << ", " << "libswscale " << ffmpeg_version_to_string (swscale_version()) << ", " << MagickVersion << ", " - << "libssh " << ssh_version (0); + << "libssh " << ssh_version (0) << ", " + << "libdcp " << libdcp::version << " git " << libdcp::git_commit; return s.str (); } diff --git a/src/lib/version.h b/src/lib/version.h new file mode 100644 index 000000000..71639e3bc --- /dev/null +++ b/src/lib/version.h @@ -0,0 +1,3 @@ + +extern char const * dvdomatic_version; +extern char const * dvdomatic_git_commit; diff --git a/src/lib/wscript b/src/lib/wscript index a263a13d1..65df3f4ac 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -52,5 +52,6 @@ def build(bld): transcode_job.cc transcoder.cc util.cc + version.cc """ obj.target = 'dvdomatic' |