Splitting the X11-specific "freeglut_ext.c" code into its own file

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1060 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c
index 72bdaf9..3c3c127 100644 (file)
--- a/src/Common/freeglut_ext.c
+++ b/src/Common/freeglut_ext.c
@@ -203,36 +203,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
 }\r
 \r
 \r
-#if TARGET_HOST_POSIX_X11\r
-GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )\r
-{\r
-    /* optimization: quick initial check */\r
-    if( strncmp( procName, "glut", 4 ) != 0 )\r
-        return NULL;\r
-\r
-#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;\r
-    CHECK_NAME(glutJoystickFunc);\r
-    CHECK_NAME(glutForceJoystickFunc);\r
-    CHECK_NAME(glutGameModeString);\r
-    CHECK_NAME(glutEnterGameMode);\r
-    CHECK_NAME(glutLeaveGameMode);\r
-    CHECK_NAME(glutGameModeGet);\r
-#undef CHECK_NAME\r
-\r
-    return NULL;\r
-}\r
-\r
-\r
-SFG_Proc fgPlatformGetProcAddress( const char *procName )\r
-{\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
 glutGetProcAddress( const char *procName )\r

diff --git a/src/x11/freeglut_ext_x11.c b/src/x11/freeglut_ext_x11.c
index e69de29..280ebc9 100644 (file)
--- a/src/x11/freeglut_ext_x11.c
+++ b/src/x11/freeglut_ext_x11.c
@@ -0,0 +1,60 @@
+/*\r
+ * freeglut_ext.c\r
+ *\r
+ * Functions related to OpenGL extensions.\r
+ *\r
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.\r
+ * Written by Pawel W. Olszta, <olszta@sourceforge.net>\r
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>\r
+ * Creation date: Thur Feb 2 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
+#define GLX_GLXEXT_PROTOTYPES\r
+#include <GL/freeglut.h>\r
+#include "freeglut_internal.h"\r
+\r
+GLUTproc fgPlatformGlutGetProcAddress( const char* procName )\r
+{\r
+    /* optimization: quick initial check */\r
+    if( strncmp( procName, "glut", 4 ) != 0 )\r
+        return NULL;\r
+\r
+#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;\r
+    CHECK_NAME(glutJoystickFunc);\r
+    CHECK_NAME(glutForceJoystickFunc);\r
+    CHECK_NAME(glutGameModeString);\r
+    CHECK_NAME(glutEnterGameMode);\r
+    CHECK_NAME(glutLeaveGameMode);\r
+    CHECK_NAME(glutGameModeGet);\r
+#undef CHECK_NAME\r
+\r
+    return NULL;\r
+}\r
+\r
+\r
+SFG_Proc fgPlatformGetProcAddress( const char *procName )\r
+{\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
+\r