summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c>2010-02-27 19:10:59 (GMT)
committerkintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c>2010-02-27 19:10:59 (GMT)
commit738174847a7d78cba9c2b7eb6fb485da945363f1 (patch)
tree2eca98dfcbe86fca1ea83fc560884837f1ba62f3 /src
parentd3a2971206da5a2df01ab14995c2e765526dbf0f (diff)
Q_OS_UNIX is also defined for Mac (Mac is a Unix)
git-svn-id: http://svn.clifford.at/openscad/trunk@456 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'src')
-rw-r--r--src/openscad.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/openscad.cc b/src/openscad.cc
index 850c9bd..3cf719b 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -169,8 +169,7 @@ int main(int argc, char **argv)
#ifdef Q_WS_MAC
exdir.cd("../Resources"); // Examples can be bundled
if (!exdir.exists("examples")) exdir.cd("../../..");
-#endif
-#ifdef Q_OS_UNIX
+#elif defined(Q_OS_UNIX)
if (exdir.cd("../../examples")) {
examplesdir = exdir.path();
} else
@@ -189,8 +188,7 @@ int main(int argc, char **argv)
#ifdef Q_WS_MAC
libdir.cd("../Resources"); // Libraries can be bundled
if (!libdir.exists("libraries")) libdir.cd("../../..");
-#endif
-#ifdef Q_OS_UNIX
+#elif defined(Q_OS_UNIX)
if (libdir.cd("../../libraries")) {
librarydir = libdir.path();
} else
contact: Jan Huwald // Impressum