diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-05-18 10:22:57 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-05-19 13:39:40 -0600 |
| commit | 70ae8bf26fbbac58900237b815ce86c01d09eb96 (patch) | |
| tree | aa35665ba6d858e693c5daa5301215ed9f14279d /progs/egl/opengles1 | |
| parent | bc73a6289f5e28636d579e17e8a8d70a2d8d7500 (diff) | |
progs/egl: Fix building on cygwin.
Update the Makefiles to use variables such as EGL_LIB_NAME. Define M_PI
if it hasn't been defined yet.
Diffstat (limited to 'progs/egl/opengles1')
| -rw-r--r-- | progs/egl/opengles1/Makefile | 8 | ||||
| -rw-r--r-- | progs/egl/opengles1/pbuffer.c | 3 | ||||
| -rw-r--r-- | progs/egl/opengles1/render_tex.c | 4 | ||||
| -rw-r--r-- | progs/egl/opengles1/torus.c | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/progs/egl/opengles1/Makefile b/progs/egl/opengles1/Makefile index 593145d4bf..e7802f8003 100644 --- a/progs/egl/opengles1/Makefile +++ b/progs/egl/opengles1/Makefile @@ -12,13 +12,13 @@ HEADERS = $(TOP)/include/GLES/egl.h ES1_LIB_DEPS = \ - $(TOP)/$(LIB_DIR)/libEGL.so \ - $(TOP)/$(LIB_DIR)/libGLESv1_CM.so + $(TOP)/$(LIB_DIR)/$(EGL_LIB_NAME) \ + $(TOP)/$(LIB_DIR)/$(GLESv1_CM_LIB_NAME) ES1_LIBS = \ - -L$(TOP)/$(LIB_DIR) -lEGL \ - -L$(TOP)/$(LIB_DIR) -lGLESv1_CM $(LIBDRM_LIB) $(X11_LIBS) + -L$(TOP)/$(LIB_DIR) -l$(EGL_LIB) -l$(GLESv1_CM_LIB) \ + $(LIBDRM_LIB) $(X11_LIBS) EGLUT_DIR = $(TOP)/progs/egl/eglut diff --git a/progs/egl/opengles1/pbuffer.c b/progs/egl/opengles1/pbuffer.c index 60f864445a..1b4dbb666f 100644 --- a/progs/egl/opengles1/pbuffer.c +++ b/progs/egl/opengles1/pbuffer.c @@ -22,6 +22,9 @@ #include <EGL/egl.h> +#ifndef M_PI +#define M_PI 3.14159265 +#endif static int WinWidth = 300, WinHeight = 300; diff --git a/progs/egl/opengles1/render_tex.c b/progs/egl/opengles1/render_tex.c index 0200fa4cb0..cd2abbd51b 100644 --- a/progs/egl/opengles1/render_tex.c +++ b/progs/egl/opengles1/render_tex.c @@ -22,6 +22,10 @@ #include <EGL/egl.h> +#ifndef M_PI +#define M_PI 3.14159265 +#endif + static int TexWidth = 256, TexHeight = 256; static int WinWidth = 300, WinHeight = 300; diff --git a/progs/egl/opengles1/torus.c b/progs/egl/opengles1/torus.c index 8f262b53d6..18ddff3fe4 100644 --- a/progs/egl/opengles1/torus.c +++ b/progs/egl/opengles1/torus.c @@ -17,6 +17,10 @@ #include "eglut.h" +#ifndef M_PI +#define M_PI 3.14159265 +#endif + static const struct { GLenum internalFormat; const char *name; |