From 5739d33cd5c801d47b6d6e4b753811b13639bfbd Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Sun, 10 Apr 2011 17:41:32 +0200 Subject: Bugfix: Handling of input-file was not working diff --git a/src/openscad.cc b/src/openscad.cc index bc1d845..aa0188c 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -144,15 +144,21 @@ int main(int argc, char **argv) ("o", po::value(), "off-file") ("x", po::value(), "dxf-file") ("d", po::value(), "deps-file") - ("m", po::value(), "make file") - ("D", po::value >(), "var=val") - ; + ("m", po::value(), "makefile") + ("D", po::value >(), "var=val"); + + po::options_description hidden("Hidden options"); + hidden.add_options() + ("input-file", po::value< vector >(), "input file"); po::positional_options_description p; p.add("input-file", -1); + po::options_description all_options; + all_options.add(desc).add(hidden); + po::variables_map vm; - po::store(po::command_line_parser(argc, argv).options(desc).positional(p).run(), vm); + po::store(po::command_line_parser(argc, argv).options(all_options).positional(p).run(), vm); // po::notify(vm); if (vm.count("help")) help(argv[0]); @@ -348,7 +354,7 @@ int main(int argc, char **argv) new MainWindow(qfilename); vector inputFiles; if (vm.count("input-file")) { - inputFiles = vm["input-files"].as >(); + inputFiles = vm["input-file"].as >(); for (vector::const_iterator i = inputFiles.begin()+1; i != inputFiles.end(); i++) { new MainWindow(QFileInfo(original_path, i->c_str()).absoluteFilePath()); } -- cgit v0.10.1