summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorclifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>2010-02-28 14:05:51 (GMT)
committerclifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>2010-02-28 14:05:51 (GMT)
commite6c2a2b26e421645759ced7f536fd39c093f70b3 (patch)
tree942527801099f7a20ec05c4fbb949420008b250a /src
parent496d236903f399dd54f1073e20e899e49aa48c1f (diff)
Clifford Wolf:
Fixed linux release scripts for libraries Improved libraries and examples dir search order for linux git-svn-id: http://svn.clifford.at/openscad/trunk@461 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'src')
-rw-r--r--src/openscad.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openscad.cc b/src/openscad.cc
index 3cf719b..37c0294 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -170,15 +170,15 @@ int main(int argc, char **argv)
exdir.cd("../Resources"); // Examples can be bundled
if (!exdir.exists("examples")) exdir.cd("../../..");
#elif defined(Q_OS_UNIX)
- if (exdir.cd("../../examples")) {
- examplesdir = exdir.path();
- } else
if (exdir.cd("../share/openscad/examples")) {
examplesdir = exdir.path();
} else
if (exdir.cd("../../share/openscad/examples")) {
examplesdir = exdir.path();
} else
+ if (exdir.cd("../../examples")) {
+ examplesdir = exdir.path();
+ } else
#endif
if (exdir.cd("examples")) {
examplesdir = exdir.path();
@@ -189,15 +189,15 @@ int main(int argc, char **argv)
libdir.cd("../Resources"); // Libraries can be bundled
if (!libdir.exists("libraries")) libdir.cd("../../..");
#elif defined(Q_OS_UNIX)
- if (libdir.cd("../../libraries")) {
- librarydir = libdir.path();
- } else
if (libdir.cd("../share/openscad/libraries")) {
librarydir = libdir.path();
} else
if (libdir.cd("../../share/openscad/libraries")) {
librarydir = libdir.path();
} else
+ if (libdir.cd("../../libraries")) {
+ librarydir = libdir.path();
+ } else
#endif
if (libdir.cd("libraries")) {
librarydir = libdir.path();
contact: Jan Huwald // Impressum