diff options
Diffstat (limited to 'progs/slang/framework.h')
| -rw-r--r-- | progs/slang/framework.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/progs/slang/framework.h b/progs/slang/framework.h index fe1c4cbd38..e023f7da8a 100644 --- a/progs/slang/framework.h +++ b/progs/slang/framework.h @@ -6,9 +6,10 @@ #include <windows.h> #endif -#include <assert.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> +#include <assert.h> #include <math.h> #include <GL/gl.h> #include <GL/glut.h> @@ -25,8 +26,10 @@ /* * GL_ARB_multitexture */ +#ifndef GL_ARB_multitexture extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB; extern PFNGLMULTITEXCOORD4FVARBPROC glMultiTexCoord4fvARB; +#endif /* * GL_ARB_shader_objects @@ -68,12 +71,12 @@ extern PFNGLFOGCOORDPOINTEREXTPROC glFogCoordPointerEXT; extern PFNGLSECONDARYCOLOR3FVEXTPROC glSecondaryColor3fvEXT; extern PFNGLSECONDARYCOLORPOINTEREXTPROC glSecondaryColorPointerEXT; -void InitFramework (int *argc, char *argv[]); +extern void InitFramework (int *argc, char *argv[]); extern void InitScene (void); extern void RenderScene (void); -GLboolean CheckObjectStatus (GLhandleARB); +extern GLboolean CheckObjectStatus (GLhandleARB); #endif |