From 52a4607f324f8767f8139bff9b6d2a13c400d959 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 2 May 2012 11:54:27 -0400 Subject: Ported away from Qt 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 -#include // 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")) { -- cgit v0.10.1