[Desmume-cvs] SF.net SVN: desmume:[3366] trunk/desmume/src/OGLRender.cpp

[<wnt...@us...>]

Revision: 3366
          http://desmume.svn.sourceforge.net/desmume/?rev=3366&view=rev
Author:   wntrmute
Date:     2010-02-03 21:55:22 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
use __APPLE__ for OSX specifics

Modified Paths:
--------------
    trunk/desmume/src/OGLRender.cpp

Modified: trunk/desmume/src/OGLRender.cpp
===================================================================
--- trunk/desmume/src/OGLRender.cpp	2010-02-03 21:29:51 UTC (rev 3365)
+++ trunk/desmume/src/OGLRender.cpp	2010-02-03 21:55:22 UTC (rev 3366)
@@ -50,7 +50,7 @@
 	#include <GL/gl.h>
 	#include <GL/glext.h>
 #else
-#ifdef DESMUME_COCOA
+#ifdef __APPLE__
 	#include <OpenGL/gl.h>
 	#include <OpenGL/glext.h>
 #else
@@ -100,12 +100,12 @@
 
 #ifdef _WIN32
 #define INITOGLEXT(x,y) y = (x)wglGetProcAddress(#y);
-#elif !defined(DESMUME_COCOA)
+#elif !defined(__APPLE__)
 #include <GL/glx.h>
 #define INITOGLEXT(x,y) y = (x)glXGetProcAddress((const GLubyte *) #y);
 #endif
 
-#ifndef DESMUME_COCOA
+#ifndef __APPLE__
 OGLEXT(PFNGLCREATESHADERPROC,glCreateShader)
 //zero: i dont understand this at all. my glext.h has the wrong thing declared here... so I have to do it myself
 typedef void (APIENTRYP X_PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, const GLchar **source, GLsizei *length);
@@ -415,7 +415,7 @@
 
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-#ifndef DESMUME_COCOA
+#ifndef __APPLE__
 	INITOGLEXT(PFNGLCREATESHADERPROC,glCreateShader)
 	INITOGLEXT(X_PFNGLGETSHADERSOURCEPROC,glShaderSource)
 	INITOGLEXT(PFNGLCOMPILESHADERPROC,glCompileShader)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.