Corrected errors for gcc-4.6 under ubuntu (conflicts between glew and qt :( )

This commit is contained in:
Paolo Cignoni 2012-10-07 17:33:19 +00:00
parent 98fd61970e
commit a2f65f19ca
3 changed files with 7 additions and 4 deletions

View File

@ -38,10 +38,6 @@
**
****************************************************************************/
#include <QtGui>
#include <QtOpenGL>
#include <math.h>
#include "glwidget.h"
#include <wrap/qt/trackball.h>
#include <wrap/gl/picking.h>

View File

@ -41,7 +41,10 @@
#ifndef GLWIDGET_H
#define GLWIDGET_H
#include <GL/glew.h>
#include <QGLWidget>
#include <QKeyEvent>
/// vcg imports
#include <vcg/simplex/vertex/base.h>
#include <vcg/simplex/face/base.h>
@ -55,6 +58,7 @@
#include <wrap/gl/trimesh.h>
#include <wrap/gui/trackball.h>
/// declaring edge and face type
#include <AntTweakBar.h>
using namespace vcg;

View File

@ -35,3 +35,6 @@ mac{
QMAKE_POST_LINK ="cp -P ../../../../code/lib/AntTweakBar1.14/lib/libAntTweakBar.dylib . ; install_name_tool -change ../lib/libAntTweakBar.dylib ./libAntTweakBar.dylib $$TARGET"
}
unix{
LIBS +=$$ANTDIR/lib/libAntTweakBar.so -lGLU
}