diff options
| author | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2015-06-25 02:27:58 +0000 |
|---|---|---|
| committer | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2015-06-25 02:27:58 +0000 |
| commit | 5b90af247ea3801ce93ec0922b8b81396caa885d (patch) | |
| tree | 59c2be6a595ee4a0d14dd093d95040263a87d8b3 /tools/tiffgt.c | |
| parent | 0319952da29b7b6504b7af800c1ee8b22c9dd6da (diff) | |
| download | libtiff-git-5b90af247ea3801ce93ec0922b8b81396caa885d.tar.gz | |
* CMakeLists.txt: Add CMake patchset by Roger Leigh as posted to
libtiff mailing list on Mon, 22 Jun 2015 21:21:01 +0100. Several
corrections to ensure that the autotools build still works were
added by me. I have not yet tested the build using 'cmake' or
MSVC with 'nmake'.
Diffstat (limited to 'tools/tiffgt.c')
| -rw-r--r-- | tools/tiffgt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/tiffgt.c b/tools/tiffgt.c index 84ca491c..3a0d5154 100644 --- a/tools/tiffgt.c +++ b/tools/tiffgt.c @@ -1,4 +1,4 @@ -/* $Id: tiffgt.c,v 1.13 2015-06-21 01:09:11 bfriesen Exp $ */ +/* $Id: tiffgt.c,v 1.14 2015-06-25 02:28:01 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -31,11 +31,14 @@ #include <string.h> #include <unistd.h> -#if HAVE_APPLE_OPENGL_FRAMEWORK +#ifdef HAVE_OPENGL_GL_H # include <OpenGL/gl.h> -# include <GLUT/glut.h> #else # include <GL/gl.h> +#endif +#ifdef HAVE_GLUT_GLUT_H +# include <GLUT/glut.h> +#else # include <GL/glut.h> #endif |