diff options
| author | Marius Kintel <marius@kintel.net> | 2012-08-18 23:08:07 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-08-18 23:08:07 (GMT) |
| commit | 3ee8c09db244a4131db188d590e70329ae1fb854 (patch) | |
| tree | bb44d30323300fd4a6f59b710efb28c5f37d2a91 /src/parsersettings.cc | |
| parent | f53375733413b840d10f8a02ab51eee033529baa (diff) | |
Make OS checks independent of Qt
Diffstat (limited to 'src/parsersettings.cc')
| -rw-r--r-- | src/parsersettings.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parsersettings.cc b/src/parsersettings.cc index 9409add..47859c7 100644 --- a/src/parsersettings.cc +++ b/src/parsersettings.cc @@ -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")) { |