diff options
| author | Marius Kintel <marius@kintel.net> | 2013-01-17 14:58:54 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-01-17 14:58:54 (GMT) |
| commit | 0b1029ff4d6f17a9f397adbf3f0a011cc20d76a5 (patch) | |
| tree | e59dc3c1f4068bb748ebedde54c935a5ab3ef9ca /openscad.pro | |
| parent | 8dfc6d71cae370a84e50f4cc7624c05c859a4cea (diff) | |
| parent | 20280e88cacc8935de139cd2ce46836beda87e0b (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/openscad.pro b/openscad.pro index 91bd735..b11f45b 100644 --- a/openscad.pro +++ b/openscad.pro @@ -90,14 +90,28 @@ unix:!macx { } netbsd* { - LIBS += -L/usr/X11R7/lib + QMAKE_LFLAGS += -L/usr/X11R7/lib QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib QMAKE_LFLAGS += -Wl,-R/usr/pkg/lib !isEmpty(OPENSCAD_LIBDIR) { - QMAKE_LFLAGS += -Wl,-R$$OPENSCAD_LIBDIR/lib + QMAKE_CFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CFLAGS + QMAKE_CXXFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CXXFLAGS + QMAKE_LFLAGS = -L$$OPENSCAD_LIBDIR/lib $$QMAKE_LFLAGS + QMAKE_LFLAGS = -Wl,-R$$OPENSCAD_LIBDIR/lib $$QMAKE_LFLAGS } } +# Prevent LD_LIBRARY_PATH problems when running the openscad binary +# on systems where uni-build-dependencies.sh was used. +# Will not affect 'normal' builds. +!isEmpty(OPENSCAD_LIBDIR) { + unix:!macx { + QMAKE_LFLAGS = -Wl,-R$$OPENSCAD_LIBDIR/lib $$QMAKE_LFLAGS + # need /lib64 beause GLEW installs itself there on 64 bit machines + QMAKE_LFLAGS = -Wl,-R$$OPENSCAD_LIBDIR/lib64 $$QMAKE_LFLAGS + } +} + # See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs. *g++* { QMAKE_CXXFLAGS *= -fno-strict-aliasing |