diff options
Diffstat (limited to 'tests/cgalcachetest.cc')
| -rw-r--r-- | tests/cgalcachetest.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/tests/cgalcachetest.cc b/tests/cgalcachetest.cc index 3a0a855..b65a2c8 100644 --- a/tests/cgalcachetest.cc +++ b/tests/cgalcachetest.cc @@ -30,7 +30,7 @@ #include "parsersettings.h" #include "node.h" #include "module.h" -#include "context.h" +#include "modcontext.h" #include "value.h" #include "export.h" #include "builtin.h" @@ -40,7 +40,6 @@ #include "PolySetCGALEvaluator.h" #include "CGALCache.h" -#include <QCoreApplication> #ifndef _MSC_VER #include <getopt.h> #endif @@ -57,7 +56,6 @@ namespace po = boost::program_options; std::string commandline_commands; std::string currentdir; -QString examplesdir; using std::string; @@ -124,19 +122,18 @@ int main(int argc, char **argv) Builtins::instance()->initialize(); - QCoreApplication app(argc, argv); fs::path original_path = fs::current_path(); - currentdir = boosty::stringy( fs::current_path() ); + currentdir = boosty::stringy(fs::current_path()); - parser_init(QCoreApplication::instance()->applicationDirPath().toStdString()); - add_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries")); + parser_init(boosty::stringy(fs::path(argv[0]).branch_path())); + add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries")); - Context root_ctx; - register_builtin(root_ctx); + ModuleContext root_ctx; + root_ctx.registerBuiltin(); AbstractModule *root_module; - ModuleInstantiation root_inst; + ModuleInstantiation root_inst("group"); root_module = parsefile(filename); if (!root_module) { |