X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=1c7429e0579168d3015a6d6a9e22ccd5b5a0cd93;hb=0e653a9d94fec583f7a4172b721c1c599e06cbc8;hp=2119d1a1da90a5a7b67de48b3ca732278800fbfd;hpb=6de0216ace8e54ec823458b2cd0df3b6438a0e1f;p=freeglut diff --git a/src/fg_internal.h b/src/fg_internal.h index 2119d1a..1c7429e 100644 --- a/src/fg_internal.h +++ b/src/fg_internal.h @@ -42,7 +42,7 @@ || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) ) # define TARGET_HOST_MS_WINDOWS 1 -#elif defined (ANDROID) +#elif defined (__ANDROID__) # define TARGET_HOST_ANDROID 1 #elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) @@ -166,7 +166,13 @@ typedef unsigned long fg_time_t; #endif - +#ifndef __fg_unused +# ifdef __GNUC__ +# define __fg_unused __attribute__((unused)) +# else +# define __fg_unused +# endif +#endif /* Platform-specific includes */ #if TARGET_HOST_POSIX_X11 @@ -320,6 +326,7 @@ struct tagSFG_State int MinorVersion; /* Minor OpenGL context version */ int ContextFlags; /* OpenGL context flags */ int ContextProfile; /* OpenGL context profile */ + int HasOpenGL20; /* fgInitGL2 could find all OpenGL 2.0 functions */ FGError ErrorFunc; /* User defined error handler */ FGWarning WarningFunc; /* User defined warning handler */ }; @@ -360,6 +367,8 @@ struct tagSFG_Context SFG_PlatformContext pContext; /* The window's FBConfig (X11) or device context (Windows) */ int DoubleBuffered; /* Treat the window as double-buffered */ + GLint attribute_v_coord; + GLint attribute_v_normal; };