diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
| commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
| tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /src/dxftess-glu.cc | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/dxftess-glu.cc')
| -rw-r--r-- | src/dxftess-glu.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/dxftess-glu.cc b/src/dxftess-glu.cc index 23d8a45..4ad2051 100644 --- a/src/dxftess-glu.cc +++ b/src/dxftess-glu.cc @@ -4,13 +4,11 @@ #include "grid.h" #include <stdio.h> -#ifdef ENABLE_OPENCSG -// this must be included before the GL headers -# include <GL/glew.h> -#endif -#include <qgl.h> +#include "system-gl.h" #include "mathc99.h" +#include <QVector> + #ifdef WIN32 # define STDCALL __stdcall #else |