Skip to content

Commit

Permalink
Clifford Wolf:
Browse files Browse the repository at this point in the history
	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
  • Loading branch information
clifford committed Feb 27, 2010
1 parent d6284e5 commit d3a2971
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
9 changes: 9 additions & 0 deletions openscad.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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

16 changes: 15 additions & 1 deletion src/openscad.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +189,17 @@ 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
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();
Expand Down

0 comments on commit d3a2971

Please sign in to comment.