Change FREEGLUT_WARNINGS and *_ERRORS to FREEGLUT_PRINT_WARNINGS and *_ERRORS

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1599 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2013-04-05 10:51:07 +00:00
parent b11381ff15
commit 467a9d3995
3 changed files with 8 additions and 8 deletions

View File

@ -26,10 +26,10 @@ OPTION(FREEGLUT_BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON)
OPTION(FREEGLUT_BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) OPTION(FREEGLUT_BUILD_STATIC_LIBS "Build FreeGLUT static library." ON)
# option for whether warnings and errors should be printed # option for whether warnings and errors should be printed
OPTION(FREEGLUT_ERRORS "Lib prints errors to stderr" ON) OPTION(FREEGLUT_PRINT_ERRORS "Lib prints errors to stderr" ON)
#MARK_AS_ADVANCED(FREEGLUT_ERRORS) #MARK_AS_ADVANCED(FREEGLUT_PRINT_ERRORS)
OPTION(FREEGLUT_WARNINGS "Lib prints warnings to stderr" ON) OPTION(FREEGLUT_PRINT_WARNINGS "Lib prints warnings to stderr" ON)
#MARK_AS_ADVANCED(FREEGLUT_WARNINGS) #MARK_AS_ADVANCED(FREEGLUT_PRINT_WARNINGS)
# option to also copy .pdb files to install directory when executing # option to also copy .pdb files to install directory when executing
# INSTALL target # INSTALL target

View File

@ -25,5 +25,5 @@
#define VERSION_PATCH @VERSION_PATCH@ #define VERSION_PATCH @VERSION_PATCH@
/* warning and errors printed? */ /* warning and errors printed? */
#define FREEGLUT_WARNINGS @FREEGLUT_WARNINGS@ #cmakedefine FREEGLUT_PRINT_WARNINGS
#define FREEGLUT_ERRORS @FREEGLUT_ERRORS@ #cmakedefine FREEGLUT_PRINT_ERRORS

View File

@ -308,7 +308,7 @@ void fgError( const char *fmt, ... )
va_end( ap ); va_end( ap );
} else { } else {
#if FREEGLUT_ERRORS #ifdef FREEGLUT_PRINT_ERRORS
va_start( ap, fmt ); va_start( ap, fmt );
fprintf( stderr, "freeglut "); fprintf( stderr, "freeglut ");
@ -341,7 +341,7 @@ void fgWarning( const char *fmt, ... )
va_end( ap ); va_end( ap );
} else { } else {
#if FREEGLUT_WARNINGS #ifdef FREEGLUT_PRINT_WARNINGS
va_start( ap, fmt ); va_start( ap, fmt );
fprintf( stderr, "freeglut "); fprintf( stderr, "freeglut ");