diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
| commit | 52dfffd97ba49b603b4814d843cd9be08d040364 (patch) | |
| tree | 044c93d19aa38ac24822a241babbece7425bfbb2 /openscad.pro | |
| parent | 0be212e75d73644b1cff8291a4b6a6fe0098b942 (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/openscad.pro b/openscad.pro index 710a3bd..f104cf1 100644 --- a/openscad.pro +++ b/openscad.pro @@ -86,6 +86,15 @@ linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) { LIBS += -lGLU } +netbsd* { + LIBS += -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 + } +} + # See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs. *g++* { QMAKE_CXXFLAGS *= -fno-strict-aliasing @@ -146,6 +155,7 @@ HEADERS += src/renderer.h \ src/builtin.h \ src/context.h \ src/csgterm.h \ + src/csgtermnormalizer.h \ src/dxfdata.h \ src/dxfdim.h \ src/dxftess.h \ @@ -197,6 +207,7 @@ SOURCES += src/mathc99.cc \ src/node.cc \ src/context.cc \ src/csgterm.cc \ + src/csgtermnormalizer.cc \ src/polyset.cc \ src/csgops.cc \ src/transform.cc \ |