diff options
| author | Marius Kintel <marius@kintel.net> | 2011-04-12 20:44:26 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-04-12 20:44:26 (GMT) |
| commit | 95c2fdcabf184e13a4ea067cf5cb11f81220d3ce (patch) | |
| tree | 7570de8cd30b08b214d5a2dcb6a4ca16a490ba2c /openscad.pro | |
| parent | c9093c0ad5d9d625d8a57380949946d90e745800 (diff) | |
| parent | c8dd96b76f672d5f99ceb63db2155447bbaa868b (diff) | |
Merge branch 'master' into sphere-cyl
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openscad.pro b/openscad.pro index 5b3a398..eecae9a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -161,6 +161,7 @@ SOURCES += src/openscad.cc \ src/primitives.cc \ src/projection.cc \ src/cgaladv.cc \ + src/cgaladv_convexhull2.cc \ src/cgaladv_minkowski3.cc \ src/cgaladv_minkowski2.cc \ src/surface.cc \ @@ -180,7 +181,7 @@ SOURCES += src/openscad.cc \ src/Preferences.cc \ src/progress.cc \ src/editor.cc \ - src/mathc99.cc + src/mathc99.cc macx { HEADERS += src/AppleEvents.h \ @@ -198,4 +199,3 @@ INSTALLS += examples libraries.path = /usr/local/share/openscad/libraries/ libraries.files = libraries/* INSTALLS += libraries - |