X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=ba1b71656e154195265b0bc457d2a5a87f8c5187;hb=d25b8eed1320c5d73e09a5aff61bfa0cce06ed87;hp=da18176bb5a64e761432f24062f2b1b610331695;hpb=e9ebb8053106d2504605c70a1fd777a52f1d9da4;p=freeglut diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index da18176..ba1b716 100644 --- 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 - * 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 @@ -57,8 +57,10 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN 1 # endif -# define NOMINMAX -# include +# ifndef NOMINMAX +# define NOMINMAX +# endif +# include /* Windows static library */ # ifdef FREEGLUT_STATIC