projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding multitouch capability per e-mail from Florian Echtler dated 3/17/11 12:07 PM
[freeglut]
/
include
/
GL
/
freeglut_std.h
diff --git
a/include/GL/freeglut_std.h
b/include/GL/freeglut_std.h
index
806d053
..
e10836b
100644
(file)
--- a/
include/GL/freeglut_std.h
+++ b/
include/GL/freeglut_std.h
@@
-43,7
+43,7
@@
*/
/* Define FREEGLUT_LIB_PRAGMAS to 1 to include library
*/
/* Define FREEGLUT_LIB_PRAGMAS to 1 to include library
- * pragmas or to 1 to exclude library pragmas.
+ * pragmas or to 0 to exclude library pragmas.
* The default behavior depends on the compiler/platform.
*/
# ifndef FREEGLUT_LIB_PRAGMAS
* The default behavior depends on the compiler/platform.
*/
# ifndef FREEGLUT_LIB_PRAGMAS
@@
-58,7
+58,7
@@
# define WIN32_LEAN_AND_MEAN 1
# endif
# define NOMINMAX
# define WIN32_LEAN_AND_MEAN 1
# endif
# define NOMINMAX
-# include <Windows.h>
+# include <windows.h>
/* Windows static library */
# ifdef FREEGLUT_STATIC
/* Windows static library */
# ifdef FREEGLUT_STATIC
@@
-171,8
+171,6
@@
#define GLUT_MULTISAMPLE 0x0080
#define GLUT_STEREO 0x0100
#define GLUT_LUMINANCE 0x0200
#define GLUT_MULTISAMPLE 0x0080
#define GLUT_STEREO 0x0100
#define GLUT_LUMINANCE 0x0200
-#define GLUT_CAPTIONLESS 0x0400
-#define GLUT_BORDERLESS 0x0800
/*
* GLUT API macro definitions -- windows and menu related definitions
/*
* GLUT API macro definitions -- windows and menu related definitions