From: parasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Date: Wed, 25 May 2011 16:47:03 +0000 (+0000)
Subject: Tweak GLES compile-time switch semantics
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=65ec86489ba1081cc4219017d069cda90d309db8;p=neverball

Tweak GLES compile-time switch semantics

git-svn-id: https://s.snth.net/svn/neverball/branches/gles@3583 78b8d119-cf0a-0410-b17c-f493084dd1d7
---

diff --git a/ball/main.c b/ball/main.c
index dd4a6bd..98a33d9 100644
--- a/ball/main.c
+++ b/ball/main.c
@@ -65,7 +65,7 @@ static void shot_take(void)
 
 static void toggle_wire(void)
 {
-#ifndef CONF_OPENGLES
+#if !ENABLE_OPENGLES
     static int wire = 0;
 
     if (wire)
diff --git a/putt/main.c b/putt/main.c
index e467879..1c173da 100644
--- a/putt/main.c
+++ b/putt/main.c
@@ -64,7 +64,7 @@ static void shot_take(void)
 
 static void toggle_wire(void)
 {
-#ifndef CONF_OPENGLES
+#if !ENABLE_OPENGLES
     static int wire = 0;
 
     if (wire)
diff --git a/share/glext.c b/share/glext.c
index feccbb2..cd0d795 100644
--- a/share/glext.c
+++ b/share/glext.c
@@ -18,7 +18,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-#ifndef CONF_OPENGLES
+#if !ENABLE_OPENGLES
 
 PFNGLCLIENTACTIVETEXTURE_PROC glClientActiveTexture_;
 PFNGLACTIVETEXTURE_PROC       glActiveTexture_;
@@ -66,7 +66,7 @@ int glext_check(const char *needle)
 
 void glext_init(void)
 {
-#ifndef CONF_OPENGLES
+#if !ENABLE_OPENGLES
 
     void *ptr;
 
@@ -96,7 +96,7 @@ void glext_init(void)
 
 void glClipPlane4f(GLenum p, GLfloat a, GLfloat b, GLfloat c, GLfloat d)
 {
-#ifdef CONF_OPENGLES
+#if ENABLE_OPENGLES
 
     GLfloat v[4];
 
diff --git a/share/glext.h b/share/glext.h
index 7aec78e..26ea12d 100644
--- a/share/glext.h
+++ b/share/glext.h
@@ -95,7 +95,7 @@ void glext_init(void);
     defined(GL_VERSION_ES_CM_1_1) || \
     defined(GL_OES_VERSION_1_0)
 
-#define CONF_OPENGLES 1
+#define ENABLE_OPENGLES 1
 
 #define glClientActiveTexture_ glClientActiveTexture
 #define glActiveTexture_       glActiveTexture
@@ -147,7 +147,7 @@ typedef void (*PFNGLPOINTPARAMETERFV_PROC)(GLenum, const GLfloat *);
 extern PFNGLPOINTPARAMETERFV_PROC glPointParameterfv_;
 
 /*---------------------------------------------------------------------------*/
-#endif /* !CONF_OPENGLES */
+#endif /* !ENABLE_OPENGLES */
 
 void glClipPlane4f(GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
 
diff --git a/share/solid_draw.c b/share/solid_draw.c
index 38af14d..cdee133 100644
--- a/share/solid_draw.c
+++ b/share/solid_draw.c
@@ -256,7 +256,7 @@ void sol_apply_mtrl(const struct d_mtrl *mp_draw, struct s_rend *rend)
 
     /* Environment mapping. */
 
-#ifndef CONF_OPENGLES
+#if !ENABLE_OPENGLES
     if ((mp_base->fl & M_ENVIRONMENT) ^ (mq_base->fl & M_ENVIRONMENT))
     {
         if (mp_base->fl & M_ENVIRONMENT)
diff --git a/share/video.c b/share/video.c
index 2d51ab4..0d2fb5a 100644
--- a/share/video.c
+++ b/share/video.c
@@ -98,7 +98,7 @@ int video_mode(int f, int w, int h)
         glEnable(GL_LIGHTING);
         glEnable(GL_BLEND);
 
-#ifndef CONF_OPENGLES
+#if !ENABLE_OPENGLES
         glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL,
                       GL_SEPARATE_SPECULAR_COLOR);
 #endif