From afbdd3e54406166249c9cbe667e9f53ff6782e0c Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Fri, 20 Jan 2012 03:38:05 +0000 Subject: [PATCH 1/1] Moving some Windows-specific code from "freeglut_ext.c" into its own file git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@984 7f0cb862-5218-0410-a997-914c9d46530a --- src/Common/freeglut_ext.c | 8 +++++--- src/mswin/freeglut_ext_mswin.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c index 8dd1c13..ef73481 100644 --- a/src/Common/freeglut_ext.c +++ b/src/Common/freeglut_ext.c @@ -29,6 +29,8 @@ #include #include "freeglut_internal.h" +extern SFG_Proc fghGetProcAddress( const char *procName ); + static GLUTproc fghGetGLUTProcAddress( const char* procName ) { /* 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 ) { -#if TARGET_HOST_MS_WINDOWS - return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName ); -#elif TARGET_HOST_POSIX_X11 && defined( GLX_ARB_get_proc_address ) +#if defined( GLX_ARB_get_proc_address ) return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName ); #else return NULL; #endif } +#endif GLUTproc FGAPIENTRY diff --git a/src/mswin/freeglut_ext_mswin.c b/src/mswin/freeglut_ext_mswin.c index e69de29..2df7d9b 100644 --- a/src/mswin/freeglut_ext_mswin.c +++ b/src/mswin/freeglut_ext_mswin.c @@ -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, + * 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 +#include "freeglut_internal_mswin.h" + + + +SFG_Proc fghGetProcAddress( const char *procName ) +{ + return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName ); +} -- 1.7.10.4