razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

More path fixes

Browse source
This commit is contained in:
Artisteacher 2019-12-15 20:31:40 -05:00
parent 48cbb835c2
commit c851bfc478
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
View file

@ -70,8 +70,7 @@ TFilePath getGlobalRoot() {
// Leggo la globalRoot da File txt // Leggo la globalRoot da File txt
#ifdef MACOSX #ifdef MACOSX
// If MACOSX, change to MACOSX path // If MACOSX, change to MACOSX path
std::string unixpath = "./" + tver.getAppName() + "_" + std::string unixpath = "./" + tver.getAppName() +
tver.getAppVersionString() +
".app/Contents/Resources/configfarmroot.txt"; ".app/Contents/Resources/configfarmroot.txt";
#else #else
// set path to something suitable for most linux (Unix?) systems // set path to something suitable for most linux (Unix?) systems
@ -116,8 +115,7 @@ std:
// Leggo la localRoot da File txt // Leggo la localRoot da File txt
#ifdef MACOSX #ifdef MACOSX
// If MACOSX, change to MACOSX path // If MACOSX, change to MACOSX path
std::string unixpath = "./" + tver.getAppName() + "_" + std::string unixpath = "./" + tver.getAppName() +
tver.getAppVersionString() +
".app/Contents/Resources/configfarmroot.txt"; ".app/Contents/Resources/configfarmroot.txt";
#else #else
// set path to something suitable for most linux (Unix?) systems // set path to something suitable for most linux (Unix?) systems

6
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
View file

@ -76,8 +76,7 @@ TFilePath getGlobalRoot() {
// Leggo la localRoot da File txt // Leggo la localRoot da File txt
#ifdef MACOSX #ifdef MACOSX
// If MACOSX, change to MACOSX path // If MACOSX, change to MACOSX path
std::string unixpath = "./" + tver.getAppName() + "_" + std::string unixpath = "./" + tver.getAppName() +
tver.getAppVersionString() +
".app/Contents/Resources/configfarmroot.txt"; ".app/Contents/Resources/configfarmroot.txt";
#else #else
// set path to something suitable for most linux (Unix?) systems // set path to something suitable for most linux (Unix?) systems
@ -121,8 +120,7 @@ TFilePath getLocalRoot() {
#else #else
#ifdef MACOSX #ifdef MACOSX
// If MACOSX, change to MACOSX path // If MACOSX, change to MACOSX path
std::string unixpath = "./" + tver.getAppName() + "_" + std::string unixpath = "./" + tver.getAppName() +
tver.getAppVersionString() +
".app/Contents/Resources/configfarmroot.txt"; ".app/Contents/Resources/configfarmroot.txt";
#else #else
// set path to something suitable for most linux (Unix?) systems // set path to something suitable for most linux (Unix?) systems