Merge master.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 8623d9194..ee9e2cdc0 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -47,6 +47,7 @@ help (string n)
 	     << "  -v, --version      show DCP-o-matic version\n"
 	     << "  -h, --help         show this help\n"
 	     << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
+	     << "  -f, --flags        show flags passed to C++ compiler on build\n"
 	     << "  -n, --no-progress  do not print progress to stdout\n"
 	     << "  -r, --no-remote    do not use any remote servers\n"
 	     << "\n"
@@ -67,13 +68,14 @@ main (int argc, char* argv[])
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
 			{ "deps", no_argument, 0, 'd'},
+			{ "flags", no_argument, 0, 'f'},
 			{ "no-progress", no_argument, 0, 'n'},
 			{ "no-remote", no_argument, 0, 'r'},
 			{ "log-level", required_argument, 0, 'l' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "vhdnrl:", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdfnrl:", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -89,6 +91,9 @@ main (int argc, char* argv[])
 		case 'd':
 			cout << dependency_version_summary () << "\n";
 			exit (EXIT_SUCCESS);
+		case 'f':
+			cout << dcpomatic_cxx_flags << "\n";
+			exit (EXIT_SUCCESS);
 		case 'n':
 			progress = false;
 			break;