Showing the changes to interface/src/main.cpp (1 of 26 files). Show all
Unified · Split
| @@ -106,6 +106,7 @@ int main(int argc, const char* argv[]) { · 105 unmodified lines | |||
| 106 | instanceMightBeRunning = false; | 106 | instanceMightBeRunning = false; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | #if defined(Q_OS_ANDROID) | ||
| 109 | std::vector<QString> assetDirs = { | 110 | std::vector<QString> assetDirs = { |
| 110 | "/resources", | 111 | "/resources", |
| 111 | "/scripts", | 112 | "/scripts", |
| @@ -115,7 +116,7 @@ int main(int argc, const char* argv[]) { · 3 unmodified lines | |||
| 115 | QString dir = *it; | 116 | QString dir = *it; |
| 116 | PathUtils::copyDirDeep("assets:" + dir, QUrl::fromLocalFile(dirInfo.canonicalPath() + dir).toLocalFile()); | 117 | PathUtils::copyDirDeep("assets:" + dir, QUrl::fromLocalFile(dirInfo.canonicalPath() + dir).toLocalFile()); |
| 117 | } | 118 | } |
| 118 | 119 | #endif | |
| 119 | // this needs to be done here in main, as the mechanism for setting the | 120 | // this needs to be done here in main, as the mechanism for setting the |
| 120 | // scripts directory appears not to work. See the bug report | 121 | // scripts directory appears not to work. See the bug report |
| 121 | // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine | 122 | // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine |