summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-05-02 15:54:27 (GMT)
committerMarius Kintel <marius@kintel.net>2012-05-02 15:54:27 (GMT)
commit52a4607f324f8767f8139bff9b6d2a13c400d959 (patch)
treeac11ccab6119fe78676022d26b74f0691fa1cc34 /src
parentc0d5a9bb308497bf70d6a8d0bdc02c9b8db90389 (diff)
Ported away from Qt
Diffstat (limited to 'src')
-rw-r--r--src/parsersettings.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/parsersettings.cc b/src/parsersettings.cc
index a3a02b7..134514c 100644
--- a/src/parsersettings.cc
+++ b/src/parsersettings.cc
@@ -1,6 +1,5 @@
#include "parsersettings.h"
#include <boost/filesystem.hpp>
-#include <qglobal.h> // Needed for Q_ defines - move the offending code somewhere else
using namespace boost::filesystem;
#include "boosty.h"
@@ -22,10 +21,10 @@ void parser_init(const std::string &applicationpath)
std::string librarydir;
path libdir(applicationpath);
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")) {
contact: Jan Huwald // Impressum