Commit 6c3080c2 authored by Sylvain Thery's avatar Sylvain Thery

Merge branch 'master' of cgogn:CGoGN

parents af2b3121 bc2b03f8
...@@ -28,10 +28,11 @@ ...@@ -28,10 +28,11 @@
#include "Utils/gl_def.h" #include "Utils/gl_def.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include <string> #include <string>
#include <QImage>
#ifndef WITH_QT #ifdef WITH_QT
#error "Texture class need Qt for loading images, please recompile CGoGN with Qt support" #include <QImage>
//#else
//#error "Texture class need Qt for loading images, please recompile CGoGN with Qt support if necessary"
#endif #endif
// TODO externaliser le chargement d'image pour enlever la dependance Qt ?? // TODO externaliser le chargement d'image pour enlever la dependance Qt ??
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment