diff --git a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp index 66ffc5f..610df76 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp @@ -368,8 +368,7 @@ static QString getExeName(bool isComposer) { return name + ".exe "; #elif defined(MACOSX) TVER::ToonzVersion tver; - return "\"./" + QString::fromStdString(tver.getAppName()) + "_" + - QString::fromStdString(tver.getAppVersionString()) + + return "\"./" + QString::fromStdString(tver.getAppName()) + ".app/Contents/MacOS/" + name + "\" "; #else return name; diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp index a1c038a..8b20957 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp +++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp @@ -70,8 +70,7 @@ TFilePath getGlobalRoot() { // Leggo la globalRoot da File txt #ifdef MACOSX // If MACOSX, change to MACOSX path - std::string unixpath = "./" + tver.getAppName() + "_" + - tver.getAppVersionString() + + std::string unixpath = "./" + tver.getAppName() + ".app/Contents/Resources/configfarmroot.txt"; #else // set path to something suitable for most linux (Unix?) systems @@ -116,8 +115,7 @@ std: // Leggo la localRoot da File txt #ifdef MACOSX // If MACOSX, change to MACOSX path - std::string unixpath = "./" + tver.getAppName() + "_" + - tver.getAppVersionString() + + std::string unixpath = "./" + tver.getAppName() + ".app/Contents/Resources/configfarmroot.txt"; #else // set path to something suitable for most linux (Unix?) systems diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index be839a3..d5e1abd 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -76,8 +76,7 @@ TFilePath getGlobalRoot() { // Leggo la localRoot da File txt #ifdef MACOSX // If MACOSX, change to MACOSX path - std::string unixpath = "./" + tver.getAppName() + "_" + - tver.getAppVersionString() + + std::string unixpath = "./" + tver.getAppName() + ".app/Contents/Resources/configfarmroot.txt"; #else // set path to something suitable for most linux (Unix?) systems @@ -121,8 +120,7 @@ TFilePath getLocalRoot() { #else #ifdef MACOSX // If MACOSX, change to MACOSX path - std::string unixpath = "./" + tver.getAppName() + "_" + - tver.getAppVersionString() + + std::string unixpath = "./" + tver.getAppName() + ".app/Contents/Resources/configfarmroot.txt"; #else // set path to something suitable for most linux (Unix?) systems @@ -385,8 +383,7 @@ static QString getExeName(bool isComposer) { return name + ".exe "; #elif defined(MACOSX) TVER::ToonzVersion tver; - return "\"./" + QString::fromStdString(tver.getAppName()) + "_" + - QString::fromStdString(tver.getAppVersionString()) + + return "\"./" + QString::fromStdString(tver.getAppName()) + ".app/Contents/MacOS/" + name + "\" "; #else return name;