History

Resolving comments in PR

Gabriel Calero committed 8 years ago

Commit 60507371 parent 6d732dd26 files · +58 −297Browse files

Showing the changes to interface/src/main.cpp (1 of 26 files). Show all

Unified · Split

interface/src/main.cpp+2−1
@@ -106,6 +106,7 @@ int main(int argc, const char* argv[]) { · 105 unmodified lines
106106 instanceMightBeRunning = false;
107107 }
108108
109+#if defined(Q_OS_ANDROID)
109110 std::vector<QString> assetDirs = {
110111 "/resources",
111112 "/scripts",
@@ -115,7 +116,7 @@ int main(int argc, const char* argv[]) { · 3 unmodified lines
115116 QString dir = *it;
116117 PathUtils::copyDirDeep("assets:" + dir, QUrl::fromLocalFile(dirInfo.canonicalPath() + dir).toLocalFile());
117118 }
118−
119+#endif
119120 // this needs to be done here in main, as the mechanism for setting the
120121 // scripts directory appears not to work. See the bug report
121122 // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine