From ad0e67005a3d459d70441d83a852b00be22b1f12 Mon Sep 17 00:00:00 2001 From: Federico Ponchio ponchio Date: Wed, 20 Feb 2013 10:44:29 +0000 Subject: [PATCH] addded missing includes (porting to qt5) --- src/meshlab/additionalgui.h | 9 +++++++++ src/meshlab/mainwindow.h | 1 + src/meshlab/meshlab.pro | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/meshlab/additionalgui.h b/src/meshlab/additionalgui.h index c8a7789fe..df2c70984 100644 --- a/src/meshlab/additionalgui.h +++ b/src/meshlab/additionalgui.h @@ -4,6 +4,15 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../common/scriptsyntax.h" #include "../common/searcher.h" diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index b69af682a..727559a28 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -34,6 +34,7 @@ #include #include #include +#include #include "../common/pluginmanager.h" #include "../common/scriptinterface.h" #include "glarea.h" diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index 1ea52660a..be7dfefdf 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -129,7 +129,7 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom # win32-g++:release:LIBS += -L../common/release -lcommon #} -linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon +linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU linux-g++:QMAKE_RPATHDIR += ../distrib linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon linux-g++-32:QMAKE_RPATHDIR += ../distrib @@ -142,4 +142,4 @@ linux-g++-64:QMAKE_RPATHDIR += ../distrib # The following define is needed in gcc to remove the asserts win32-g++:DEFINES += NDEBUG -CONFIG(debug, debug|release):win32-g++:release:DEFINES -= NDEBUG \ No newline at end of file +CONFIG(debug, debug|release):win32-g++:release:DEFINES -= NDEBUG