projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed up handling of WM_MOUSEWHEEL, low order of wParam is not the mouse
[freeglut]
/
include
/
GL
/
freeglut_std.h
diff --git
a/include/GL/freeglut_std.h
b/include/GL/freeglut_std.h
index
23e6806
..
8cac2dc
100644
(file)
--- 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
/* 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) */
# endif
/* Windows shared library (DLL) */
@@
-84,7
+88,11
@@
/* Link with Win32 shared freeglut lib */
# if FREEGLUT_LIB_PRAGMAS
/* 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
# endif
# endif
@@
-113,8
+121,10
@@
*/
#define FREEGLUT 1
#define GLUT_API_VERSION 4
*/
#define FREEGLUT 1
#define GLUT_API_VERSION 4
-#define FREEGLUT_VERSION_2_0 1
#define GLUT_XLIB_IMPLEMENTATION 13
#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
/*
* Always include OpenGL and GLU headers
@@
-128,6
+138,9
@@
#elif FREEGLUT_GLES1
# include <EGL/egl.h>
# include <GLES/gl.h>
#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>
#else
# include <GL/gl.h>
# include <GL/glu.h>
@@
-544,6
+557,7
@@
FGAPI void FGAPIENTRY glutSolidIcosahedron( void );
/*
* Teapot rendering functions, found in freeglut_teapot.c
/*
* 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
*/
/* TODO: doesn't work with GLES1 yet */
#ifndef EGL_VERSION_1_0