Attachment 30074 Details for Bug 24318 – Patch to fix building of GLSL demos which use M_PI when M_PI is not defined by math.h

[patch] Patch to fix building of GLSL demos which use M_PI when M_PI is not defined by math.h

0002-Fix-building-of-GLSL-demos-which-use-M_PI.patch (text/plain), 1.53 KB, created by Jon Turney on 2009-10-05 06:16:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2009-10-05 06:16:28 UTC

Size: 1.53 KB

patch

obsolete

>From 021f8b7021e92fbaa3e0b9937f6dd5be5219d622 Mon Sep 17 00:00:00 2001
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Fri, 24 Jul 2009 20:33:25 +0100
>Subject: [PATCH 2/2] Fix building of GLSL demos which use M_PI
>
>Some <math.h> files do not define M_PI, in which case, provide our own definition
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> progs/glsl/skinning.c  |    3 +++
> progs/glsl/texaaline.c |    3 +++
> progs/glsl/twoside.c   |    3 +++
> 3 files changed, 9 insertions(+), 0 deletions(-)
>
>diff --git a/progs/glsl/skinning.c b/progs/glsl/skinning.c
>index 65ba983..2b96f31 100644
>--- a/progs/glsl/skinning.c
>+++ b/progs/glsl/skinning.c
>@@ -16,6 +16,9 @@
> #include <GL/glut.h>
> #include "shaderutil.h"
> 
>+#ifndef M_PI
>+#define M_PI 3.1415926535
>+#endif
> 
> static char *FragProgFile = "skinning.frag";
> static char *VertProgFile = "skinning.vert";
>diff --git a/progs/glsl/texaaline.c b/progs/glsl/texaaline.c
>index 7a5ac40..2e4f932 100644
>--- a/progs/glsl/texaaline.c
>+++ b/progs/glsl/texaaline.c
>@@ -14,6 +14,9 @@
> #include <GL/glew.h>
> #include <GL/glut.h>
> 
>+#ifndef M_PI
>+#define M_PI 3.1415926535
>+#endif
> 
> static GLint WinWidth = 300, WinHeight = 300;
> static GLint win = 0;
>diff --git a/progs/glsl/twoside.c b/progs/glsl/twoside.c
>index a57484f..ce155d6 100644
>--- a/progs/glsl/twoside.c
>+++ b/progs/glsl/twoside.c
>@@ -16,6 +16,9 @@
> #include <GL/glut.h>
> #include "shaderutil.h"
> 
>+#ifndef M_PI
>+#define M_PI 3.1415926535
>+#endif
> 
> static GLint WinWidth = 300, WinHeight = 300;
> static char *FragProgFile = NULL;
>-- 
>1.6.4.2
>

Actions: View | Splinter Review

Attachments on bug 24318: 30074 | 30659 | 30660 | 35298 | 35299 | 37144

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.