From ccd227e67c046d374a7e17ed54aad6190b01b166 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Sat, 18 Jul 2015 01:09:18 +0200 Subject: [PATCH] Rez: don't insist on .r input files when --copy is present --- Rez/Rez.cc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Rez/Rez.cc b/Rez/Rez.cc index 53b06dc288..2461791eaf 100644 --- a/Rez/Rez.cc +++ b/Rez/Rez.cc @@ -62,7 +62,7 @@ int main(int argc, const char *argv[]) po::notify(options); - if(options.count("help") || !options.count("input")) + if(options.count("help") || (!options.count("input") && !options.count("copy"))) { usage(); return 0; @@ -91,21 +91,22 @@ int main(int argc, const char *argv[]) world.getResources().addResources(copyRsrc.resources); } - for(std::string fn : options["input"].as>()) - { - RezLexer lexer(fn); + if(options.count("input")) + for(std::string fn : options["input"].as>()) + { + RezLexer lexer(fn); - if(options.count("define")) - for(std::string define : options["define"].as>()) - lexer.addDefine(define); - if(options.count("include")) - for(std::string path : options["include"].as>()) - lexer.addIncludePath(path); + if(options.count("define")) + for(std::string define : options["define"].as>()) + lexer.addDefine(define); + if(options.count("include")) + for(std::string path : options["include"].as>()) + lexer.addIncludePath(path); - RezParser parser(lexer, world); - parser.parse(); - } + RezParser parser(lexer, world); + parser.parse(); + } rsrcFile.resources = world.getResources(); rsrcFile.creator = options["creator"].as();