Replaced the .cpp-ized (for build issue) common GLUT source files by their

standard .c version.
Remove outdated Makefile.orig.

1 files changed, 58 insertions, 0 deletions

diff --git a/src/glut/beos/glut_bwidth.c b/src/glut/beos/glut_bwidth.c
new file mode 100644
index 00000000000..bee5e8827ea
--- /dev/null
+++ b/src/glut/beos/glut_bwidth.c
@@ -0,0 +1,58 @@
+
+/* Copyright (c) Mark J. Kilgard, 1994. */
+
+/* This program is freely distributable without licensing fees
+   and is provided without guarantee or warrantee expressed or
+   implied. This program is -not- in the public domain. */
+
+#include "glutint.h"
+#include "glutbitmap.h"
+
+/* CENTRY */
+int APIENTRY 
+glutBitmapWidth(GLUTbitmapFont font, int c)
+{
+  BitmapFontPtr fontinfo;
+  const BitmapCharRec *ch;
+
+#ifdef _WIN32
+  fontinfo = (BitmapFontPtr) __glutFont(font);
+#else
+  fontinfo = (BitmapFontPtr) font;
+#endif
+
+  if (c < fontinfo->first || c >= fontinfo->first + fontinfo->num_chars)
+    return 0;
+  ch = fontinfo->ch[c - fontinfo->first];
+  if (ch)
+    return ch->advance;
+  else
+    return 0;
+}
+
+int APIENTRY 
+glutBitmapLength(GLUTbitmapFont font, const unsigned char *string)
+{
+  int c, length;
+  BitmapFontPtr fontinfo;
+  const BitmapCharRec *ch;
+
+#ifdef _WIN32
+  fontinfo = (BitmapFontPtr) __glutFont(font);
+#else
+  fontinfo = (BitmapFontPtr) font;
+#endif
+
+  length = 0;
+  for (; *string != '\0'; string++) {
+    c = *string;
+    if (c >= fontinfo->first && c < fontinfo->first + fontinfo->num_chars) {
+      ch = fontinfo->ch[c - fontinfo->first];
+      if (ch)
+        length += ch->advance;
+    }
+  }
+  return length;
+}
+
+/* ENDCENTRY */