From 3ee8c09db244a4131db188d590e70329ae1fb854 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 18 Aug 2012 19:08:07 -0400
Subject: Make OS checks independent of Qt


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")) {
-- 
cgit v0.10.1


From 3ac6b033b786347e1fb183a18fe80fd306f99f76 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 18 Aug 2012 19:08:50 -0400
Subject: Lion compile fix


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>
-- 
cgit v0.10.1