AxioDL
/
nod
mirror of https://github.com/AxioDL/nod.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux build fixes

This commit is contained in:
Jack Andersen 2017-11-12 21:21:29 -10:00
parent 27a2cb5998
commit 69e96e3b3c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
driver/main.cpp
View File

@ -61,13 +61,13 @@ int main(int argc, char* argv[])
outDir = argv[a]; outDir = argv[a];
} }
auto progFunc = [&](float prog, const nod::SystemString& name, size_t bytes) auto progFunc = [&](float prog, nod::SystemStringView name, size_t bytes)
{ {
nod::Printf(_S("\r ")); nod::Printf(_S("\r "));
if (bytes != -1) if (bytes != -1)
nod::Printf(_S("\r%g%% %s %" PRISize " B"), prog * 100.f, name.c_str(), bytes); nod::Printf(_S("\r%g%% %s %" PRISize " B"), prog * 100.f, name.data(), bytes);
else else
nod::Printf(_S("\r%g%% %s"), prog * 100.f, name.c_str()); nod::Printf(_S("\r%g%% %s"), prog * 100.f, name.data());
fflush(stdout); fflush(stdout);
}; };
@ -106,7 +106,7 @@ int main(int argc, char* argv[])
{ {
nod::SystemString outPath(argv[2]); nod::SystemString outPath(argv[2]);
outPath.append(_S(".iso")); outPath.append(_S(".iso"));
nod::DiscBuilderGCN b(outPath.c_str(), progFunc); nod::DiscBuilderGCN b(outPath, progFunc);
ret = b.buildFromDirectory(argv[2]); ret = b.buildFromDirectory(argv[2]);
} }
else else