From 387c4fbd92fafc3d3d1493e0d82b115966dc6943 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 22 Sep 2015 21:52:16 -0700 Subject: [PATCH] fix bad oglplus pragma warnings --- libraries/render-utils/src/OglplusHelpers.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libraries/render-utils/src/OglplusHelpers.h b/libraries/render-utils/src/OglplusHelpers.h index 99232b97cb..4734b8b213 100644 --- a/libraries/render-utils/src/OglplusHelpers.h +++ b/libraries/render-utils/src/OglplusHelpers.h @@ -24,6 +24,11 @@ #define OGLPLUS_NO_SITE_CONFIG 1 #define OGLPLUS_LOW_PROFILE 1 +// NOTE: oglplus does some naked "#pragma GCC" without proper platform wrapping, so we need to disable this warning. +#ifdef _WIN32 +#pragma warning(push) +#pragma warning( disable : 4068 ) +#endif #include #include @@ -34,6 +39,10 @@ #include #include +#ifdef _WIN32 +#pragma warning(pop) +#endif + #include "NumericalConstants.h" using FramebufferPtr = std::shared_ptr;