diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-05-02 11:13:39 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-05-02 11:18:10 +0100 |
| commit | 4721b994831049f57e1bba6e5da591dbb6f8e76a (patch) | |
| tree | 34a23380a367b676f471b018040b85c42eef9281 | |
| parent | b84d22238b6a4b0b46c72bc693a62ae3a7b0b78e (diff) | |
Include windows.h and GL/gl.h before glut.h.
Prevents conflicting declaration errors inside glext.h with recent
MinGW compiler toolchains.
| -rw-r--r-- | src/tools/difftiff/main.cpp | 1 | ||||
| -rw-r--r-- | src/tools/showtiff/main.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/difftiff/main.cpp b/src/tools/difftiff/main.cpp index f4a0a37..b9a117c 100644 --- a/src/tools/difftiff/main.cpp +++ b/src/tools/difftiff/main.cpp @@ -31,6 +31,7 @@ #include <stdlib.h> #include <iostream> +#include "glwrap.h" #if(__AGL__) #include <GLUT/glut.h> #else diff --git a/src/tools/showtiff/main.cpp b/src/tools/showtiff/main.cpp index 6a900b1..b1d625c 100644 --- a/src/tools/showtiff/main.cpp +++ b/src/tools/showtiff/main.cpp @@ -31,6 +31,7 @@ #include <stdlib.h> #include <iostream> +#include "glwrap.h" #if(__AGL__) #include <GLUT/glut.h> #else |