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/opengl | |
| 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/opengl')
| -rw-r--r-- | progs/egl/opengl/Makefile | 4 | ||||
| -rw-r--r-- | progs/egl/opengl/eglgears.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile index 79cd5fc653..a49255bbb2 100644 --- a/progs/egl/opengl/Makefile +++ b/progs/egl/opengl/Makefile @@ -7,9 +7,9 @@ include $(TOP)/configs/current INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS) HEADERS = $(TOP)/include/GLES/egl.h -LIB_DEP = $(TOP)/$(LIB_DIR)/libEGL.so +LIB_DEP = $(TOP)/$(LIB_DIR)/$(EGL_LIB_NAME) -LIBS = -L$(TOP)/$(LIB_DIR) -lEGL -lGL -lm +LIBS = -L$(TOP)/$(LIB_DIR) -l$(EGL_LIB) -l$(GL_LIB) -lm EGLUT_DIR = $(TOP)/progs/egl/eglut diff --git a/progs/egl/opengl/eglgears.c b/progs/egl/opengl/eglgears.c index 28da9c0ac7..430deb26e5 100644 --- a/progs/egl/opengl/eglgears.c +++ b/progs/egl/opengl/eglgears.c @@ -33,6 +33,10 @@ #include "eglut.h" +#ifndef M_PI +#define M_PI 3.14159265 +#endif + static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0; static GLint gear1, gear2, gear3; static GLfloat angle = 0.0; |