diff options
| author | Marius Kintel <marius@kintel.net> | 2013-01-05 22:57:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-01-05 22:57:08 (GMT) |
| commit | 101510c5cb3f696ee01fc900c9269d87a09c0658 (patch) | |
| tree | 0d368ccb44ccf8dc6c7752e4e4097fd590af523a /openscad.pro | |
| parent | bc7ff5aa8d73ff08bd847bc8d0f41dc26deee54e (diff) | |
| parent | db9a78f028803619cb68e17c7478e3de956e61d8 (diff) | |
Merge pull request #235 from openscad/mxebuild_fix
Mxebuild fix
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 |