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

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
+extern SFG_Proc fghGetProcAddress( const char *procName );\r
+\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
+#if TARGET_HOST_POSIX_X11\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
+#endif\r
 \r
 \r
 GLUTproc FGAPIENTRY\r

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