From 87cc2da16ef2c32813eee9c9c8af3c919f4739d9 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 12 May 2010 14:17:17 +0800 Subject: mesa/es: Merge back to core mesa. With the omit list gone, there are not too many differences in building core mesa and ES overlay. Remove the mesa/es and build both of them in src/mesa/Makefile. --- src/gallium/targets/egl-apis/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/targets/egl-apis/Makefile b/src/gallium/targets/egl-apis/Makefile index 15556a1346..878254c092 100644 --- a/src/gallium/targets/egl-apis/Makefile +++ b/src/gallium/targets/egl-apis/Makefile @@ -23,8 +23,8 @@ OpenVG_SYS := -lm -L$(TOP)/$(LIB_DIR) -l$(VG_LIB) # project libs GL_LIBS := $(TOP)/src/mesa/libmesagallium.a -GLESv1_CM_LIBS := $(TOP)/src/mesa/es/libes1gallium.a -GLESv2_LIBS := $(TOP)/src/mesa/es/libes2gallium.a +GLESv1_CM_LIBS := $(TOP)/src/mesa/libes1gallium.a +GLESv2_LIBS := $(TOP)/src/mesa/libes2gallium.a OpenVG_LIBS := $(TOP)/src/gallium/state_trackers/vega/libvega.a # objects -- cgit v1.2.3