diff options
| author | Chia-I Wu <[email protected]> | 2010-05-18 10:22:57 -0600 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-05-19 13:39:40 -0600 |
| commit | 70ae8bf26fbbac58900237b815ce86c01d09eb96 (patch) | |
| tree | aa35665ba6d858e693c5daa5301215ed9f14279d /progs/egl/opengles2 | |
| 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/opengles2')
| -rw-r--r-- | progs/egl/opengles2/Makefile | 8 | ||||
| -rw-r--r-- | progs/egl/opengles2/es2gears.c | 4 | ||||
| -rw-r--r-- | progs/egl/opengles2/tri.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/progs/egl/opengles2/Makefile b/progs/egl/opengles2/Makefile index 89feb34acc1..bf14513d7fb 100644 --- a/progs/egl/opengles2/Makefile +++ b/progs/egl/opengles2/Makefile @@ -14,13 +14,13 @@ HEADERS = $(TOP)/include/GLES/egl.h ES2_LIB_DEPS = \ - $(TOP)/$(LIB_DIR)/libEGL.so \ - $(TOP)/$(LIB_DIR)/libGLESv2.so + $(TOP)/$(LIB_DIR)/$(EGL_LIB_NAME) \ + $(TOP)/$(LIB_DIR)/$(GLESv2_LIB_NAME) ES2_LIBS = \ - -L$(TOP)/$(LIB_DIR) -lEGL \ - -L$(TOP)/$(LIB_DIR) -lGLESv2 $(LIBDRM_LIB) $(X11_LIBS) \ + -L$(TOP)/$(LIB_DIR) -l$(EGL_LIB) -l$(GLESv2_LIB) \ + $(LIBDRM_LIB) $(X11_LIBS) PROGRAMS = \ es2_info \ diff --git a/progs/egl/opengles2/es2gears.c b/progs/egl/opengles2/es2gears.c index 8e7a3e52490..6bd6594320a 100644 --- a/progs/egl/opengles2/es2gears.c +++ b/progs/egl/opengles2/es2gears.c @@ -46,6 +46,10 @@ #include <EGL/eglext.h> #include "eglut.h" +#ifndef M_PI +#define M_PI 3.14159265 +#endif + struct gear { GLfloat *vertices; GLuint vbo; diff --git a/progs/egl/opengles2/tri.c b/progs/egl/opengles2/tri.c index 8981d8a7e21..812dbf031e4 100644 --- a/progs/egl/opengles2/tri.c +++ b/progs/egl/opengles2/tri.c @@ -29,6 +29,10 @@ #include <EGL/egl.h> +#ifndef M_PI +#define M_PI 3.14159265 +#endif + #define FLOAT_TO_FIXED(X) ((X) * 65535.0) |