Macintosh-Tools
/
Retro68
mirror of https://github.com/autc04/Retro68.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rez: don't insist on .r input files when --copy is present

This commit is contained in:
Wolfgang Thaller 2015-07-18 01:09:18 +02:00
parent 1cc5202ccf
commit ccd227e67c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Rez/Rez.cc
View File

@ -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<std::vector<std::string>>())
{
RezLexer lexer(fn);
if(options.count("input"))
for(std::string fn : options["input"].as<std::vector<std::string>>())
{
RezLexer lexer(fn);
if(options.count("define"))
for(std::string define : options["define"].as<std::vector<std::string>>())
lexer.addDefine(define);
if(options.count("include"))
for(std::string path : options["include"].as<std::vector<std::string>>())
lexer.addIncludePath(path);
if(options.count("define"))
for(std::string define : options["define"].as<std::vector<std::string>>())
lexer.addDefine(define);
if(options.count("include"))
for(std::string path : options["include"].as<std::vector<std::string>>())
lexer.addIncludePath(path);
RezParser parser(lexer, world);
parser.parse();
}
RezParser parser(lexer, world);
parser.parse();
}
rsrcFile.resources = world.getResources();
rsrcFile.creator = options["creator"].as<std::string>();