diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:00 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:00 (GMT) |
| commit | cbabbaed700536b3a1f513fd5a07d25382cb137f (patch) | |
| tree | 17478b52e8e8205709c6862b605caf6762445dfa /openscad.pro | |
| parent | 312a25f2708fcef22e300f7bd2c1aaed61d3095d (diff) | |
| parent | 4ff2d1af446c1f276c644b12e6ec4cc6db0b6d65 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
openscad.pro
src/module.h
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/openscad.pro b/openscad.pro index 80e2b80..ffd7563 100644 --- a/openscad.pro +++ b/openscad.pro @@ -188,21 +188,14 @@ HEADERS += src/parsersettings.h \ src/system-gl.h \ src/stl-utils.h -SOURCES += src/parsersettings.cc \ - src/openscad.cc \ - src/mainwin.cc \ +SOURCES += src/mathc99.cc \ + src/linalg.cc \ src/handle_dep.cc \ - src/renderer.cc \ - src/rendersettings.cc \ - src/ThrownTogetherRenderer.cc \ - src/glview.cc \ - src/export.cc \ src/value.cc \ src/expr.cc \ src/func.cc \ src/module.cc \ src/node.cc \ - src/builtin.cc \ src/context.cc \ src/csgterm.cc \ src/polyset.cc \ @@ -215,28 +208,39 @@ SOURCES += src/parsersettings.cc \ src/surface.cc \ src/control.cc \ src/render.cc \ - src/import.cc \ src/dxfdata.cc \ - src/dxftess.cc \ - src/dxftess-glu.cc \ - src/dxftess-cgal.cc \ src/dxfdim.cc \ src/linearextrude.cc \ src/rotateextrude.cc \ - src/highlighter.cc \ src/printutils.cc \ + src/progress.cc \ + src/parsersettings.cc \ + \ + src/nodedumper.cc \ + src/traverser.cc \ + src/PolySetEvaluator.cc \ + src/PolySetCache.cc \ + src/Tree.cc \ + \ + src/rendersettings.cc \ + src/highlighter.cc \ src/Preferences.cc \ src/OpenCSGWarningDialog.cc \ - src/progress.cc \ src/editor.cc \ - src/traverser.cc \ - src/nodedumper.cc \ + src/glview.cc \ + \ + src/builtin.cc \ + src/export.cc \ + src/import.cc \ + src/renderer.cc \ + src/ThrownTogetherRenderer.cc \ + src/dxftess.cc \ + src/dxftess-glu.cc \ + src/dxftess-cgal.cc \ src/CSGTermEvaluator.cc \ - src/Tree.cc \ - src/mathc99.cc \ - src/linalg.cc \ - src/PolySetCache.cc \ - src/PolySetEvaluator.cc + \ + src/openscad.cc \ + src/mainwin.cc opencsg { HEADERS += src/OpenCSGRenderer.h |