diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-19 18:08:32 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-19 18:08:32 (GMT) |
| commit | c6eeb1a1c5da072e1c0a77d30892e4ee95ed9bde (patch) | |
| tree | e5513fae2b6fbef7e974771eeb6deeba6e34f2a6 /src/parsersettings.cc | |
| parent | ee26d60a8b274afcdad7538bd8b2e9fb8d53f8bd (diff) | |
| parent | c1d5e82b4365bf9d0563e1c5927a99d3def91832 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/parsersettings.cc')
| -rw-r--r-- | src/parsersettings.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/parsersettings.cc b/src/parsersettings.cc index 53b34f4..47859c7 100644 --- a/src/parsersettings.cc +++ b/src/parsersettings.cc @@ -15,13 +15,13 @@ void add_librarydir(const std::string &libdir) /*! Searces for the given file in library paths and returns the full path if found. - Returns an empty path if file cannot be found. + Returns an empty path if file cannot be found or filename is a directory. */ std::string locate_file(const std::string &filename) { BOOST_FOREACH(const std::string &dir, librarypath) { fs::path usepath = fs::path(dir) / filename; - if (fs::exists(usepath)) return usepath.string(); + if (fs::exists(usepath) && !fs::is_directory(usepath)) return usepath.string(); } return std::string(); } @@ -33,10 +33,10 @@ void parser_init(const std::string &applicationpath) std::string librarydir; fs::path libdir(applicationpath); fs::path tmpdir; -#ifdef Q_WS_MAC +#ifdef __APPLE__ libdir /= "../Resources"; // Libraries can be bundled if (!is_directory(libdir / "libraries")) libdir /= "../../.."; -#elif defined(Q_OS_UNIX) +#elif !defined(WIN32) if (is_directory(tmpdir = libdir / "../share/openscad/libraries")) { librarydir = boosty::stringy( tmpdir ); } else if (is_directory(tmpdir = libdir / "../../share/openscad/libraries")) { |