Fix compilation of test cases.

master
Torsten Paul 2014-10-18 19:31:29 +02:00
parent a512a6442e
commit afd52b3075
4 changed files with 3 additions and 3 deletions

View File

@ -22,6 +22,9 @@ fs::path get_resource_dir(const std::string &resource_folder)
}
fs::path basepath(applicationdir);
#ifdef OPENSCAD_TESTING
basepath = "..";
#endif
#ifdef __APPLE__
fs::path bundlepath = basepath.parent_path().parent_path();
if (bundlepath.filename().string() == "OpenSCAD.app") {

View File

@ -117,7 +117,6 @@ int main(int argc, char **argv)
currentdir = boosty::stringy(fs::current_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;
top_ctx.registerBuiltin();

View File

@ -78,7 +78,6 @@ int main(int argc, char **argv)
currentdir = boosty::stringy( fs::current_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;
top_ctx.registerBuiltin();

View File

@ -74,7 +74,6 @@ int main(int argc, char **argv)
currentdir = boosty::stringy( fs::current_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;
top_ctx.registerBuiltin();