FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving some Windows-specific code from "freeglut_ext.c" into its own file

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@984 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-01-20 03:38:05 +00:00
parent 0417074499
commit a625fdf807
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freeglut/freeglut/src/Common/freeglut_ext.c
View File

@ -29,6 +29,8 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "freeglut_internal.h"
extern SFG_Proc fghGetProcAddress( const char *procName );
static GLUTproc fghGetGLUTProcAddress( const char* procName ) static GLUTproc fghGetGLUTProcAddress( const char* procName )
{ {
/* optimization: quick initial check */ /* optimization: quick initial check */
@ -209,16 +211,16 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
} }
#if TARGET_HOST_POSIX_X11
SFG_Proc fghGetProcAddress( const char *procName ) SFG_Proc fghGetProcAddress( const char *procName )
{ {
#if TARGET_HOST_MS_WINDOWS #if defined( GLX_ARB_get_proc_address )
return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
#elif TARGET_HOST_POSIX_X11 && defined( GLX_ARB_get_proc_address )
return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName ); return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
#else #else
return NULL; return NULL;
#endif #endif
} }
#endif
GLUTproc FGAPIENTRY GLUTproc FGAPIENTRY

36
freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
View File

@ -0,0 +1,36 @@
/*
* freeglut_cursor_mswin.c
*
* The Windows-specific mouse cursor related stuff.
*
* Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
* Written by John F. Fay, <fayjf@sourceforge.net>
* Creation date: Thu Jan 19, 2012
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <GL/freeglut.h>
#include "freeglut_internal_mswin.h"
SFG_Proc fghGetProcAddress( const char *procName )
{
return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
}