From 71ebede185c97a9f2dea8a50d10af1a3fc0c65ae Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Thu, 22 Jan 2009 14:08:32 +0000 Subject: [PATCH] added compiler flag for newest mingw gcc under Windows win32-g++:QMAKE_CXXFLAGS += -fpermissive --- src/meshlab/meshlab.pro | 3 +++ src/shared.pri | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index 9f49397fb..2f6160765 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -99,6 +99,9 @@ DEFINES += GLEW_STATIC INCLUDEPATH += . .. ../../../vcglib ../../../code/lib/glew/include CONFIG += stl +#makes it compile under win32 and newest mingw gcc +win32-g++:QMAKE_CXXFLAGS += -fpermissive + # The following define is needed in gcc to remove the asserts win32-g++:DEFINES += NDEBUG CONFIG(debug, debug|release) { diff --git a/src/shared.pri b/src/shared.pri index ce85471aa..26a6fc989 100644 --- a/src/shared.pri +++ b/src/shared.pri @@ -28,6 +28,8 @@ win32-msvc2005:DEFINES += _CRT_SECURE_NO_DEPRECATE DESTDIR = ../../meshlab/plugins +win32-g++:QMAKE_CXXFLAGS += -fpermissive + contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { unix:TARGET = $$member(TARGET, 0)_debug