Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed windows builds when OO_SHADERS is not defined.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3162 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2010-04-13 08:17:15 +00:00
parent 2dd40c216c
commit fbeaed4ef8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/OOOpenGLExtensionManager.m
View File

@ -52,7 +52,7 @@ SOFTWARE.
#import "NSThreadOOExtensions.h" #import "NSThreadOOExtensions.h"
/* OpenGL versino requiredment, currently 1.1 or later (basic stuff like /* OpenGL version required, currently 1.1 or later (basic stuff like
glBindTexture(), glDrawArrays()). We probably have implicit requirements glBindTexture(), glDrawArrays()). We probably have implicit requirements
for later versions, but I don't feel like auditing. for later versions, but I don't feel like auditing.
-- Ahruman -- Ahruman
@ -68,9 +68,9 @@ enum
/* Define the function pointers for the OpenGL extensions used in the game /* Define the function pointers for the OpenGL extensions used in the game
(required for Windows only). (required for Windows only).
*/ */
static void OOBadOpenGLExtensionUsed(void) GCC_ATTR((noreturn, used));
#if OO_SHADERS #if OO_SHADERS
static void OOBadOpenGLExtensionUsed(void) GCC_ATTR((noreturn, used));
PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)&OOBadOpenGLExtensionUsed; PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)&OOBadOpenGLExtensionUsed;
PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)&OOBadOpenGLExtensionUsed; PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)&OOBadOpenGLExtensionUsed;