diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-24 21:02:37 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-24 21:02:37 (GMT) |
| commit | 0ab51d2d23045021aed225dec8d3c3003316a124 (patch) | |
| tree | 56550f802d302e9ab4664e591581a273013c0934 /tests/csgtexttest.cc | |
| parent | dc4bc159251e8300fa51554f50008d8c59a50a02 (diff) | |
Extracted librarydir initialization to separate function
Diffstat (limited to 'tests/csgtexttest.cc')
| -rw-r--r-- | tests/csgtexttest.cc | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index d7f94f1..2c54ed4 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -28,6 +28,7 @@ #include "CSGTextRenderer.h" #include "CSGTextCache.h" #include "openscad.h" +#include "parsersettings.h" #include "node.h" #include "module.h" #include "context.h" @@ -51,7 +52,6 @@ std::string commandline_commands; QString currentdir; QString examplesdir; -QString librarydir; void csgTree(CSGTextCache &cache, const AbstractNode &root) { @@ -79,24 +79,7 @@ int main(int argc, char **argv) currentdir = QDir::currentPath(); - QDir libdir(QApplication::instance()->applicationDirPath()); -#ifdef Q_WS_MAC - libdir.cd("../Resources"); // Libraries can be bundled - if (!libdir.exists("libraries")) libdir.cd("../../.."); -#elif defined(Q_OS_UNIX) - if (libdir.cd("../share/openscad/libraries")) { - librarydir = libdir.path(); - } else - if (libdir.cd("../../share/openscad/libraries")) { - librarydir = libdir.path(); - } else - if (libdir.cd("../../libraries")) { - librarydir = libdir.path(); - } else -#endif - if (libdir.cd("libraries")) { - librarydir = libdir.path(); - } + parser_init(); Context root_ctx; register_builtin(root_ctx); |