X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=9fded35658d9ae65dd227b6e1ee1d0f94d552199;hb=6636a18df676a102cee0bcf31ce81b67dc7b7ac2;hp=8bdae356a040b73652c99eaa4dcec6ff13a8b158;hpb=71c0aa1b0c139a5555d9c07eb23edb410697c185;p=freeglut

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index 8bdae35..9fded35 100644
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -70,7 +70,11 @@
 
         /* Link with Win32 static freeglut lib */
 #       if FREEGLUT_LIB_PRAGMAS
-#           pragma comment (lib, "freeglut_static.lib")
+#           ifdef NDEBUG
+#              pragma comment (lib, "freeglut_static.lib")
+#           else
+#              pragma comment (lib, "freeglut_staticd.lib")
+#           endif
 #       endif
 
 /* Windows shared library (DLL) */
@@ -84,7 +88,11 @@
 
             /* Link with Win32 shared freeglut lib */
 #           if FREEGLUT_LIB_PRAGMAS
-#               pragma comment (lib, "freeglut.lib")
+#               ifdef NDEBUG
+#                   pragma comment (lib, "freeglut.lib")
+#               else
+#                   pragma comment (lib, "freeglutd.lib")
+#               endif
 #           endif
 
 #       endif
@@ -113,8 +121,10 @@
  */
 #define  FREEGLUT             1
 #define  GLUT_API_VERSION     4
-#define  FREEGLUT_VERSION_2_0 1
 #define  GLUT_XLIB_IMPLEMENTATION 13
+/* Deprecated:
+   cf. http://sourceforge.net/mailarchive/forum.php?thread_name=CABcAi1hw7cr4xtigckaGXB5X8wddLfMcbA_rZ3NAuwMrX_zmsw%40mail.gmail.com&forum_name=freeglut-developer */
+#define  FREEGLUT_VERSION_2_0 1
 
 /*
  * Always include OpenGL and GLU headers
@@ -128,6 +138,9 @@
 #elif FREEGLUT_GLES1
 #   include <EGL/egl.h>
 #   include <GLES/gl.h>
+#elif __APPLE__
+#   include <OpenGL/gl.h>
+#   include <OpenGL/glu.h>
 #else
 #   include <GL/gl.h>
 #   include <GL/glu.h>
@@ -546,11 +559,8 @@ FGAPI void    FGAPIENTRY glutSolidIcosahedron( void );
  * Teapot rendering functions, found in freeglut_teapot.c
  * NB: front facing polygons have clockwise winding, not counter clockwise
  */
-/* TODO: doesn't work with GLES1 yet */
-#ifndef EGL_VERSION_1_0
-FGAPI void    FGAPIENTRY glutWireTeapot( GLdouble size );
-FGAPI void    FGAPIENTRY glutSolidTeapot( GLdouble size );
-#endif
+FGAPI void    FGAPIENTRY glutWireTeapot( double size );
+FGAPI void    FGAPIENTRY glutSolidTeapot( double size );
 
 /*
  * Game mode functions, see freeglut_gamemode.c