From 96333a1907dc5d6db547b8254cd061168d4d7a5a Mon Sep 17 00:00:00 2001 From: mtabachenko Date: Thu, 8 Jan 2009 08:22:44 +0000 Subject: [PATCH] fix winport compiling; --- desmume/src/OGLRender.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp index 551e278aa..79c855167 100644 --- a/desmume/src/OGLRender.cpp +++ b/desmume/src/OGLRender.cpp @@ -133,7 +133,8 @@ OGLEXT(PFNGLBLENDFUNCSEPARATEEXTPROC,glBlendFuncSeparateEXT) OGLEXT(PFNGLGETUNIFORMLOCATIONPROC,glGetUniformLocation) OGLEXT(PFNGLUNIFORM1IPROC,glUniform1i) #endif -#ifndef GL_VERSION_1_3 + +#if !defined(GL_VERSION_1_3) || defined(_MSC_VER) || defined(__INTEL_COMPILER) OGLEXT(PFNGLACTIVETEXTUREPROC,glActiveTexture) #endif @@ -431,7 +432,7 @@ static char OGLInit(void) INITOGLEXT(PFNGLGETUNIFORMLOCATIONPROC,glGetUniformLocation) INITOGLEXT(PFNGLUNIFORM1IPROC,glUniform1i) #endif -#ifndef GL_VERSION_1_3 +#if !defined(GL_VERSION_1_3) || defined(_MSC_VER) || defined(__INTEL_COMPILER) INITOGLEXT(PFNGLACTIVETEXTUREPROC,glActiveTexture) #endif