diff options
| author | Chia-I Wu <[email protected]> | 2010-05-12 14:17:17 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-05-12 15:03:42 +0800 |
| commit | 87cc2da16ef2c32813eee9c9c8af3c919f4739d9 (patch) | |
| tree | 8fae12c282f657ff2558b8a16a2a861b414de6e2 /src/gallium | |
| parent | 8d5c83c467f83b44f5f2e271c4f9cca2d45af518 (diff) | |
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.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/egl-apis/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/targets/egl-apis/Makefile b/src/gallium/targets/egl-apis/Makefile index 15556a13464..878254c0925 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 |