diff options
| author | Jan Huwald <jh@sotun.de> | 2014-02-21 11:22:12 (GMT) |
|---|---|---|
| committer | Jan Huwald <jh@sotun.de> | 2014-02-21 11:22:12 (GMT) |
| commit | ddbd8aba5898d281fb43ca0ff0546b58d8ae59a9 (patch) | |
| tree | 2e87d2f802dc614b2a6f249363eaf414ab7315b7 | |
| parent | fbc0d7357623346c5b1b3493f6bd117a77397c5b (diff) | |
| parent | 086f231d5a9361a509e84563e2f970b60c1ef933 (diff) | |
Merge branch 'f_enable_cpp11' into f_refractor_openscadf_write_stdoutf_refractor_openscad
| -rw-r--r-- | cgal.pri | 2 | ||||
| -rw-r--r-- | openscad.pro | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -11,8 +11,6 @@ cgal { message("CGAL location: $$CGAL_DIR") } - QMAKE_CXXFLAGS += -std=c++11 - CONFIG(mingw-cross-env) { LIBS += -lgmp -lmpfr -lCGAL QMAKE_CXXFLAGS += -frounding-math diff --git a/openscad.pro b/openscad.pro index 58026b7..2564388 100644 --- a/openscad.pro +++ b/openscad.pro @@ -67,6 +67,8 @@ deploy { } } +QMAKE_CXXFLAGS += -std=c++0x + macx { TARGET = OpenSCAD ICON = icons/OpenSCAD.icns @@ -107,7 +109,6 @@ netbsd* { QMAKE_LFLAGS += -L/usr/X11R7/lib QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib QMAKE_LFLAGS += -Wl,-R/usr/pkg/lib - !clang: { QMAKE_CXXFLAGS += -std=c++0x } !isEmpty(OPENSCAD_LIBDIR) { QMAKE_CFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CFLAGS QMAKE_CXXFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CXXFLAGS |