diff options
| author | Denton Woods <devil.imagelib@gmail.com> | 2008-12-13 22:09:51 +0000 |
|---|---|---|
| committer | Denton Woods <devil.imagelib@gmail.com> | 2008-12-13 22:09:51 +0000 |
| commit | d3577314eaea48692a90fe0f85382d26d39161b5 (patch) | |
| tree | a43bd8eadcc645408ec6918f1ded58811854d5c5 /DevIL/src-ILUT/include | |
| parent | 391778e289a2c18a515ff8eec75e03453f3dd47b (diff) | |
| download | devil-d3577314eaea48692a90fe0f85382d26d39161b5.tar.gz | |
Linker problem
Diffstat (limited to 'DevIL/src-ILUT/include')
| -rw-r--r-- | DevIL/src-ILUT/include/ilut_internal.h | 5 | ||||
| -rw-r--r-- | DevIL/src-ILUT/include/ilut_opengl.h | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/DevIL/src-ILUT/include/ilut_internal.h b/DevIL/src-ILUT/include/ilut_internal.h index a8cd9a2e..f4503216 100644 --- a/DevIL/src-ILUT/include/ilut_internal.h +++ b/DevIL/src-ILUT/include/ilut_internal.h @@ -20,6 +20,9 @@ //#define WIN32_LEAN_AND_MEAN +#if defined(_WIN32) && !defined(HAVE_CONFIG_H) +#define HAVE_CONFIG_H +#endif #ifdef HAVE_CONFIG_H #include <IL/config.h> #endif @@ -27,7 +30,7 @@ #include <string.h> #ifdef _WIN32 - #ifdef _MSC_VER +#ifdef _MSC_VER #if _MSC_VER > 1000 #pragma warning(disable: 4996) // "The POSIX name for this item is deprecated." AND "This function or variable may be unsafe." #endif // _MSC_VER > 1000 diff --git a/DevIL/src-ILUT/include/ilut_opengl.h b/DevIL/src-ILUT/include/ilut_opengl.h index dbb7b657..155bd054 100644 --- a/DevIL/src-ILUT/include/ilut_opengl.h +++ b/DevIL/src-ILUT/include/ilut_opengl.h @@ -32,15 +32,19 @@ ILboolean IsExtensionSupported(const char *extension); #ifdef _WIN32 #include <windows.h> typedef void (ILAPIENTRY * ILGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -#elif linux
+#elif linux + #include <GL/gl.h> - #include <GL/glx.h> // patch #1504388. X86_64 Problems by Hans de Goede
- typedef void (ILAPIENTRY * ILGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+ #include <GL/glx.h> // patch #1504388. X86_64 Problems by Hans de Goede + + typedef void (ILAPIENTRY * ILGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); + #elif defined __APPLE__ #include <mach-o/dyld.h> void* aglGetProcAddress (const GLubyte *name); typedef void (ILAPIENTRY *ILGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -#endif
+#endif + #endif //ILUT_USE_OPENGL |