diff --git a/src/libprojectM/Common.hpp b/src/libprojectM/Common.hpp index 60affdd34..45e248a1a 100755 --- a/src/libprojectM/Common.hpp +++ b/src/libprojectM/Common.hpp @@ -35,7 +35,7 @@ #define strcasecmp(s, t) _strcmpi(s, t) #endif -#ifdef _MSC_VER +#if defined(_MSC_VER ) && !defined(EYETUNE_WINRT) #pragma warning( disable : 4244 4305 4996; once : 4018 ) #define WIN32_LEAN_AND_MEAN #define NOMINMAX diff --git a/src/libprojectM/Renderer/ShaderEngine.cpp b/src/libprojectM/Renderer/ShaderEngine.cpp index c27177016..040450b86 100644 --- a/src/libprojectM/Renderer/ShaderEngine.cpp +++ b/src/libprojectM/Renderer/ShaderEngine.cpp @@ -1224,7 +1224,7 @@ void ShaderEngine::reset() GLuint ShaderEngine::CompileShaderProgram(const std::string & VertexShaderCode, const std::string & FragmentShaderCode, const std::string & shaderTypeString){ -#ifdef WIN32 +#if defined(WIN32) && !defined(EYETUNE_WINRT) GLenum err = glewInit(); #endif /** WIN32 */ diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h index 05a18094a..3e565f2cd 100644 --- a/src/libprojectM/projectM-opengl.h +++ b/src/libprojectM/projectM-opengl.h @@ -20,6 +20,14 @@ #ifdef __APPLE__ # include # include +#elif defined(EYETUNE_WINRT) +#define GL_GLEXT_PROTOTYPES +#include +#include +#include +#include +#include +#include #elif defined(_WIN32) # include #include "glew.h" diff --git a/src/libprojectM/projectM.hpp b/src/libprojectM/projectM.hpp index fb462cae0..df0a95a1e 100755 --- a/src/libprojectM/projectM.hpp +++ b/src/libprojectM/projectM.hpp @@ -287,11 +287,15 @@ public: int getWindowHeight() { return _settings.windowHeight; } bool getErrorLoadingCurrentPreset() const { return errorLoadingCurrentPreset; } +// WINRT requires the render object +#if !defined(EYETUNE_WINRT) +private: +#endif + Renderer *renderer; private: PCM * _pcm; double sampledPresetDuration(); BeatDetect * beatDetect; - Renderer *renderer; PipelineContext * _pipelineContext; PipelineContext * _pipelineContext2; Settings _settings;