diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-02-27 10:38:13 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-02-27 10:38:13 (GMT) |
| commit | d3a2971206da5a2df01ab14995c2e765526dbf0f (patch) | |
| tree | e25dc152f25d08ab0523c217177fa8f506d32ad8 | |
| parent | d6284e5e6bba2e2f42ac5d1fc952c73a5c2f5f14 (diff) | |
Clifford Wolf:
Added libraries path detection for UNIX
Added libs and examples to 'make install'
git-svn-id: http://svn.clifford.at/openscad/trunk@455 b57f626f-c46c-0410-a088-ec61d464b74c
| -rw-r--r-- | openscad.pro | 9 | ||||
| -rw-r--r-- | src/openscad.cc | 16 |
2 files changed, 24 insertions, 1 deletions
diff --git a/openscad.pro b/openscad.pro index 3e57cd3..e44ecc7 100644 --- a/openscad.pro +++ b/openscad.pro @@ -139,3 +139,12 @@ macx { target.path = /usr/local/bin/ INSTALLS += target + +examples.path = /usr/local/share/openscad/examples/ +examples.files = examples/* +INSTALLS += examples + +libraries.path = /usr/local/share/openscad/libraries/ +libraries.files = libraries/* +INSTALLS += libraries + diff --git a/src/openscad.cc b/src/openscad.cc index 71d0297..850c9bd 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -170,10 +170,13 @@ int main(int argc, char **argv) exdir.cd("../Resources"); // Examples can be bundled if (!exdir.exists("examples")) exdir.cd("../../.."); #endif -#ifdef linux +#ifdef 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 @@ -187,6 +190,17 @@ int main(int argc, char **argv) libdir.cd("../Resources"); // Libraries can be bundled if (!libdir.exists("libraries")) libdir.cd("../../.."); #endif +#ifdef 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 +#endif if (libdir.cd("libraries")) { librarydir = libdir.path(); } |