diff --git a/src/RageDisplay_OGL.cpp b/src/RageDisplay_OGL.cpp index 1856705667..0b47a78bf2 100644 --- a/src/RageDisplay_OGL.cpp +++ b/src/RageDisplay_OGL.cpp @@ -22,6 +22,10 @@ using namespace RageDisplay_Legacy_Helpers; #include +#if defined(WINDOWS) +#include +#endif + #if defined(_MSC_VER) #pragma comment(lib, "opengl32.lib") #pragma comment(lib, "glu32.lib") @@ -743,8 +747,10 @@ RString RageDisplay_Legacy::TryVideoMode( const VideoModeParams &p, bool &bNewDe #if defined(WINDOWS) /* Set vsync the Windows way, if we can. (What other extensions are there * to do this, for other archs?) */ - if (GLEW_WGL_EXT_swap_control) + if( wglewIsSupported("WGL_EXT_swap_control") ) wglSwapIntervalEXT(p.vsync); + else + return RString("The WGL_EXT_swap_control extension is not supported on your computer."); #endif ResolutionChanged(); diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj index 88d27d87bd..53c1ab9c8a 100644 --- a/src/StepMania-net2008.vcproj +++ b/src/StepMania-net2008.vcproj @@ -51,7 +51,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;"..\extern\glew-1.5.8\include"" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" + PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -158,7 +158,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;"..\extern\glew-1.5.8\include"" - PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE" + PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" StringPooling="true" MinimalRebuild="false" ExceptionHandling="0" @@ -262,7 +262,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;"..\extern\glew-1.5.8\include"" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" + PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -369,7 +369,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;"..\extern\glew-1.5.8\include"" - PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE" + PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" StringPooling="true" MinimalRebuild="false" ExceptionHandling="0" @@ -451,6 +451,38 @@ + + + + + + + + + + + +