From 8d4c37c07da62376ba4d9d39466f243e0e327300 Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Fri, 5 Apr 2013 10:51:07 +0000 Subject: [PATCH] Change FREEGLUT_WARNINGS and *_ERRORS to FREEGLUT_PRINT_WARNINGS and *_ERRORS git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1599 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 8 ++++---- config.h.in | 4 ++-- src/fg_main.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 577947d..c28492f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 for whether warnings and errors should be printed -OPTION(FREEGLUT_ERRORS "Lib prints errors to stderr" ON) -#MARK_AS_ADVANCED(FREEGLUT_ERRORS) -OPTION(FREEGLUT_WARNINGS "Lib prints warnings to stderr" ON) -#MARK_AS_ADVANCED(FREEGLUT_WARNINGS) +OPTION(FREEGLUT_PRINT_ERRORS "Lib prints errors to stderr" ON) +#MARK_AS_ADVANCED(FREEGLUT_PRINT_ERRORS) +OPTION(FREEGLUT_PRINT_WARNINGS "Lib prints warnings to stderr" ON) +#MARK_AS_ADVANCED(FREEGLUT_PRINT_WARNINGS) # option to also copy .pdb files to install directory when executing # INSTALL target diff --git a/config.h.in b/config.h.in index 11af946..16c39c3 100644 --- a/config.h.in +++ b/config.h.in @@ -25,5 +25,5 @@ #define VERSION_PATCH @VERSION_PATCH@ /* warning and errors printed? */ -#define FREEGLUT_WARNINGS @FREEGLUT_WARNINGS@ -#define FREEGLUT_ERRORS @FREEGLUT_ERRORS@ +#cmakedefine FREEGLUT_PRINT_WARNINGS +#cmakedefine FREEGLUT_PRINT_ERRORS diff --git a/src/fg_main.c b/src/fg_main.c index 82f708c..d2108e7 100644 --- a/src/fg_main.c +++ b/src/fg_main.c @@ -308,7 +308,7 @@ void fgError( const char *fmt, ... ) va_end( ap ); } else { -#if FREEGLUT_ERRORS +#ifdef FREEGLUT_PRINT_ERRORS va_start( ap, fmt ); fprintf( stderr, "freeglut "); @@ -341,7 +341,7 @@ void fgWarning( const char *fmt, ... ) va_end( ap ); } else { -#if FREEGLUT_WARNINGS +#ifdef FREEGLUT_PRINT_WARNINGS va_start( ap, fmt ); fprintf( stderr, "freeglut "); -- 1.7.10.4