diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-19 12:19:09 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-19 12:19:09 (GMT) |
| commit | ca03eec8404d36e6261f7a10ef93a528c083a09c (patch) | |
| tree | e5c5a58a61065e26bf7b3a70970ba614af1c8278 /src | |
| parent | 17e9fe2ea9f339acfcee9df111b2301000e11b18 (diff) | |
| parent | c1d5e82b4365bf9d0563e1c5927a99d3def91832 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into eigen3
Diffstat (limited to 'src')
| -rw-r--r-- | src/parsersettings.cc | 4 | ||||
| -rw-r--r-- | src/value.cc | 3 |
2 files changed, 4 insertions, 3 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")) { diff --git a/src/value.cc b/src/value.cc index 3b7f357..7744a18 100644 --- a/src/value.cc +++ b/src/value.cc @@ -25,8 +25,9 @@ */ #include "value.h" +#include <stdio.h> #include <math.h> -#include <assert.h> // fmod +#include <assert.h> #include <sstream> #include <boost/foreach.hpp> #include <boost/variant/apply_visitor.hpp> |