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

standard .c version.
Remove outdated Makefile.orig.

1 files changed, 0 insertions, 59 deletions

diff --git a/src/glut/beos/glut_bwidth.cpp b/src/glut/beos/glut_bwidth.cpp
deleted file mode 100644
index 711dfa569e..0000000000
--- a/src/glut/beos/glut_bwidth.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/* 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 <GL/glut.h>
-#include "glutint.h"
-#include "glutbitmap.h"
-
-/* CENTRY */
-int APIENTRY 
-glutBitmapWidth(GLUTbitmapFont font, int c)
-{
-  BitmapFontPtr fontinfo;
-  const BitmapCharRec *ch;
-
-#if defined(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 (int)ch->advance;
-  else
-    return 0;
-}
-
-int APIENTRY 
-glutBitmapLength(GLUTbitmapFont font, const 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 += (int)ch->advance;
-    }
-  }
-  return length;
-}
-
-/* ENDCENTRY */