Fixing call to "fghGetProcAddress" by giving the new name of the function

[freeglut] / src / x11 / freeglut_glutfont_definitions_x11.c

diff --git a/src/x11/freeglut_glutfont_definitions_x11.c b/src/x11/freeglut_glutfont_definitions_x11.c
index e69de29..394c6c1 100644 (file)
--- a/src/x11/freeglut_glutfont_definitions_x11.c
+++ b/src/x11/freeglut_glutfont_definitions_x11.c
@@ -0,0 +1,104 @@
+/*\r
+ * freeglut_glutfont_definitions_x11.c\r
+ *\r
+ * Bitmap and stroke fonts displaying.\r
+ *\r
+ * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not).\r
+ * All Rights Reserved.\r
+ * Written by John F. Fay <fayjf@sourceforge.net>, who releases the\r
+ * copyright over to the "freeglut" project lead.\r
+ * Creation date: Mon July 21 2003\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
+/*\r
+ * This file is necessary for the *nix version of "freeglut" because the\r
+ * original GLUT defined its font variables in rather an unusual way.\r
+ * Publicly, in "glut.h", they were defined as "void *".  Privately,\r
+ * in one of the source code files, they were defined as pointers to a\r
+ * structure.  Most compilers and linkers are satisfied with the "void *"\r
+ * and don't go any farther, but some of them balked.  In particular,\r
+ * when compiling with "freeglut" and then trying to run using the GLUT\r
+ * ".so" library, some of them would give an error.  So we are having to\r
+ * create this file to define the variables as pointers to an unusual\r
+ * structure to match GLUT.\r
+ */\r
+\r
+/*\r
+ * freeglut_internal.h uses some GL types, but including the GL header portably\r
+ * is a bit tricky, so we include freeglut_std.h here, which contains the\r
+ * necessary machinery. But this poses another problem, caused by the ugly\r
+ * original defintion of the font constants in "classic" GLUT: They are defined\r
+ * as void* externally, so we move them temporarily out of the way by AN EXTREME\r
+ * CPP HACK.\r
+ */\r
+\r
+#define glutStrokeRoman glutStrokeRomanIGNOREME\r
+#define glutStrokeMonoRoman glutStrokeMonoRomanIGNOREME\r
+#define glutBitmap9By15 glutBitmap9By15IGNOREME\r
+#define glutBitmap8By13 glutBitmap8By13IGNOREME\r
+#define glutBitmapTimesRoman10 glutBitmapTimesRoman10IGNOREME\r
+#define glutBitmapTimesRoman24 glutBitmapTimesRoman24IGNOREME\r
+#define glutBitmapHelvetica10 glutBitmapHelvetica10IGNOREME\r
+#define glutBitmapHelvetica12 glutBitmapHelvetica12IGNOREME\r
+#define glutBitmapHelvetica18 glutBitmapHelvetica18IGNOREME\r
+\r
+#include <GL/freeglut_std.h>\r
+\r
+#undef glutStrokeRoman\r
+#undef glutStrokeMonoRoman\r
+#undef glutBitmap9By15\r
+#undef glutBitmap8By13\r
+#undef glutBitmapTimesRoman10\r
+#undef glutBitmapTimesRoman24\r
+#undef glutBitmapHelvetica10\r
+#undef glutBitmapHelvetica12\r
+#undef glutBitmapHelvetica18\r
+\r
+#include "../Common/freeglut_internal.h"\r
+\r
+struct freeglutStrokeFont\r
+{\r
+  const char *name ;\r
+  int num_chars ;\r
+  void *ch ;\r
+  float top ;\r
+  float bottom ;\r
+};\r
+\r
+struct freeglutBitmapFont\r
+{\r
+  const char *name ;\r
+  const int num_chars ;\r
+  const int first ;\r
+  const void *ch ;\r
+};\r
+\r
+\r
+struct freeglutStrokeFont glutStrokeRoman ;\r
+struct freeglutStrokeFont glutStrokeMonoRoman ;\r
+\r
+struct freeglutBitmapFont glutBitmap9By15 ;\r
+struct freeglutBitmapFont glutBitmap8By13 ;\r
+struct freeglutBitmapFont glutBitmapTimesRoman10 ;\r
+struct freeglutBitmapFont glutBitmapTimesRoman24 ;\r
+struct freeglutBitmapFont glutBitmapHelvetica10 ;\r
+struct freeglutBitmapFont glutBitmapHelvetica12 ;\r
+struct freeglutBitmapFont glutBitmapHelvetica18 ;\r
+\r