Merge branch 'f_enable_cpp11' of git://github.com/8p0/openscad into 8p0-f_enable_cpp11

c++11
Marius Kintel 2014-02-22 11:30:02 -05:00
commit fd1ae57c16
1 changed files with 2 additions and 1 deletions

View File

@ -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