Extracted librarydir initialization to separate function

1 files changed, 2 insertions, 19 deletions

diff --git a/tests/echotest.cc b/tests/echotest.cc
index afa3d03..9569f09 100644
--- a/tests/echotest.cc
+++ b/tests/echotest.cc
@@ -26,6 +26,7 @@
 
 #include "tests-common.h"
 #include "openscad.h"
+#include "parsersettings.h"
 #include "node.h"
 #include "module.h"
 #include "context.h"
@@ -50,7 +51,6 @@ using std::string;
 std::string commandline_commands;
 QString currentdir;
 QString examplesdir;
-QString librarydir;
 
 static void outfile_handler(const std::string &msg, void *userdata) {
 	std::ostream *str = static_cast<std::ostream*>(userdata);
@@ -87,24 +87,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);