Commit 03663110fdec127e8e4fd4d10e6e8a464c63b358
2008-06-13T21:16:09
make windows use the FONT_FILE mechanism for setting default font in demos also, no reason to special-case it. add standard license verbage to msvc config.h. tack a copyright notice on a couple files I made significant changes to.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/demo/FTGLDemo.cpp b/demo/FTGLDemo.cpp
index 3616551..c49a094 100644
--- a/demo/FTGLDemo.cpp
+++ b/demo/FTGLDemo.cpp
@@ -44,12 +44,8 @@
#include "tb.h"
#if !defined FONT_FILE
-# ifdef WIN32
-# define FONT_FILE "C:\\WINNT\\Fonts\\arial.ttf"
-# else
- // Put your font file here if configure did not find it.
-# define FONT_FILE 0
-# endif
+ // Put your font file here if configure did not find it.
+# define FONT_FILE 0
#endif
#define EDITING 1
diff --git a/msvc/config.h b/msvc/config.h
index 66e6a87..77b6916 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -1,3 +1,32 @@
+/*
+ * FTGL - OpenGL font library
+ *
+ * Copyright (c) 2008 Jeff Myers <JeffM2501@users.sourceforge.net>
+ * Copyright (c) 2008 Daniel Remenak <dtremenak@users.sourceforge.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Default font file
+#define FONT_FILE "C:\\Windows\\Fonts\\Arial.ttf"
+
// GLUT
#define HAVE_GL_GLUT_H
@@ -11,4 +40,4 @@
// quell spurious portable-function deprecation warnings
#define _CRT_SECURE_NO_DEPRECATE 1
-#define _POSIX_ 1
\ No newline at end of file
+#define _POSIX_ 1
diff --git a/src/FTFont/FTFont.cpp b/src/FTFont/FTFont.cpp
index a7206fb..0feb578 100644
--- a/src/FTFont/FTFont.cpp
+++ b/src/FTFont/FTFont.cpp
@@ -3,6 +3,7 @@
*
* Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
* Copyright (c) 2008 Sam Hocevar <sam@zoy.org>
+ * Copyright (c) 2008 Daniel Remenak <dtremenak@users.sourceforge.net>
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/src/FTLayout/FTSimpleLayout.cpp b/src/FTLayout/FTSimpleLayout.cpp
index b5a7beb..0340d3a 100644
--- a/src/FTLayout/FTSimpleLayout.cpp
+++ b/src/FTLayout/FTSimpleLayout.cpp
@@ -3,6 +3,7 @@
*
* Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
* Copyright (c) 2008 Sam Hocevar <sam@zoy.org>
+ * Copyright (c) 2008 Daniel Remenak <dtremenak@users.sourceforge.net>
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the