Browse Source

devmode defaults rather than overwrites folders

pull/1005/head
jfrey 7 years ago
parent
commit
09dc681eb8
2 changed files with 8 additions and 5 deletions
  1. +7
    -4
      src/asset.cpp
  2. +1
    -1
      src/main.cpp

+ 7
- 4
src/asset.cpp View File

@@ -28,10 +28,13 @@ static std::string localDir;

void assetInit(bool devMode, std::string customGlobalDir, std::string customLocalDir) {
if (devMode) {
// Use current working directory if running in development mode
globalDir = ".";
localDir = ".";
return;
// Use current working directory by default if running in development mode
if (customGlobalDir.empty()) {
customGlobalDir = ".";
}
if (customLocalDir.empty()) {
customLocalDir = ".";
}
}

if (customGlobalDir.empty()) {


+ 1
- 1
src/main.cpp View File

@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
// Parse command line arguments
argagg::parser argparser {{
{ "help", {"-h", "--help"}, "shows this help message", 0},
{ "devmod", {"-d", "--devmod"}, "enables dev mode (supersedes local/global folders)", 0},
{ "devmod", {"-d", "--devmod"}, "enables dev mode (will default local/global folders to current folder)", 0},
{ "global", {"-g", "--globaldir"}, "set golbalDir", 1},
{ "local", {"-l", "--localdir"}, "set localDir", 1},
{ "port", {"-p", "--port"}, "Bridge port number", 1},


Loading…
Cancel
Save