From df4f4888c43423da4e3d212656346f8258fb2964 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 18 May 2010 10:22:57 -0600 Subject: [PATCH] progs/egl: Fix building on cygwin. --- progs/egl/opengl/Makefile | 4 ++-- progs/egl/opengles1/Makefile | 8 ++++---- progs/egl/opengles2/Makefile | 8 ++++---- progs/egl/openvg/Makefile | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile index 79cd5fc..a49255b 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/opengles1/Makefile b/progs/egl/opengles1/Makefile index 593145d..e7802f8 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/opengles2/Makefile b/progs/egl/opengles2/Makefile index 89feb34..bf14513 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/openvg/Makefile b/progs/egl/openvg/Makefile index 3b11933..9a96ccc 100644 --- a/progs/egl/openvg/Makefile +++ b/progs/egl/openvg/Makefile @@ -3,7 +3,7 @@ TOP = ../../.. include $(TOP)/configs/current -VG_LIBS=-lm -lEGL -lOpenVG -L$(TOP)/lib -L$(TOP)/lib/gallium +VG_LIBS=-lm -L$(TOP)/$(LIB_DIR) -l$(EGL_LIB) -l$(VG_LIB) INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS) EGLUT_DIR = $(TOP)/progs/egl/eglut -- 1.7.1