projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving some Windows-specific code from "freeglut_ext.c" into its own file
[freeglut]
/
src
/
Common
/
freeglut_ext.c
diff --git
a/src/Common/freeglut_ext.c
b/src/Common/freeglut_ext.c
index
8dd1c13
..
ef73481
100644
(file)
--- a/
src/Common/freeglut_ext.c
+++ b/
src/Common/freeglut_ext.c
@@
-29,6
+29,8
@@
#include <GL/freeglut.h>
\r
#include "freeglut_internal.h"
\r
\r
#include <GL/freeglut.h>
\r
#include "freeglut_internal.h"
\r
\r
+extern SFG_Proc fghGetProcAddress( const char *procName );
\r
+
\r
static GLUTproc fghGetGLUTProcAddress( const char* procName )
\r
{
\r
/* optimization: quick initial check */
\r
static GLUTproc fghGetGLUTProcAddress( const char* procName )
\r
{
\r
/* optimization: quick initial check */
\r
@@
-209,16
+211,16
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
}
\r
\r
\r
}
\r
\r
\r
+#if TARGET_HOST_POSIX_X11
\r
SFG_Proc fghGetProcAddress( const char *procName )
\r
{
\r
SFG_Proc fghGetProcAddress( const char *procName )
\r
{
\r
-#if TARGET_HOST_MS_WINDOWS
\r
- return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
\r
-#elif TARGET_HOST_POSIX_X11 && defined( GLX_ARB_get_proc_address )
\r
+#if defined( GLX_ARB_get_proc_address )
\r
return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
\r
#else
\r
return NULL;
\r
#endif
\r
}
\r
return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
\r
#else
\r
return NULL;
\r
#endif
\r
}
\r
+#endif
\r
\r
\r
GLUTproc FGAPIENTRY
\r
\r
\r
GLUTproc FGAPIENTRY
\r