mirror of https://github.com/vitalif/openscad
Fix compilation of test cases.
parent
a512a6442e
commit
afd52b3075
|
@ -22,6 +22,9 @@ fs::path get_resource_dir(const std::string &resource_folder)
|
||||||
}
|
}
|
||||||
|
|
||||||
fs::path basepath(applicationdir);
|
fs::path basepath(applicationdir);
|
||||||
|
#ifdef OPENSCAD_TESTING
|
||||||
|
basepath = "..";
|
||||||
|
#endif
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
fs::path bundlepath = basepath.parent_path().parent_path();
|
fs::path bundlepath = basepath.parent_path().parent_path();
|
||||||
if (bundlepath.filename().string() == "OpenSCAD.app") {
|
if (bundlepath.filename().string() == "OpenSCAD.app") {
|
||||||
|
|
|
@ -117,7 +117,6 @@ int main(int argc, char **argv)
|
||||||
currentdir = boosty::stringy(fs::current_path());
|
currentdir = boosty::stringy(fs::current_path());
|
||||||
|
|
||||||
parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
|
parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
|
||||||
add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries"));
|
|
||||||
|
|
||||||
ModuleContext top_ctx;
|
ModuleContext top_ctx;
|
||||||
top_ctx.registerBuiltin();
|
top_ctx.registerBuiltin();
|
||||||
|
|
|
@ -78,7 +78,6 @@ int main(int argc, char **argv)
|
||||||
currentdir = boosty::stringy( fs::current_path() );
|
currentdir = boosty::stringy( fs::current_path() );
|
||||||
|
|
||||||
parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
|
parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
|
||||||
add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries"));
|
|
||||||
|
|
||||||
ModuleContext top_ctx;
|
ModuleContext top_ctx;
|
||||||
top_ctx.registerBuiltin();
|
top_ctx.registerBuiltin();
|
||||||
|
|
|
@ -74,7 +74,6 @@ int main(int argc, char **argv)
|
||||||
currentdir = boosty::stringy( fs::current_path() );
|
currentdir = boosty::stringy( fs::current_path() );
|
||||||
|
|
||||||
parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
|
parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
|
||||||
add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries"));
|
|
||||||
|
|
||||||
ModuleContext top_ctx;
|
ModuleContext top_ctx;
|
||||||
top_ctx.registerBuiltin();
|
top_ctx.registerBuiltin();
|
||||||
|
|
Loading…
Reference in New Issue