From a6ec153830ea25958f8cb5f5b5ae7a3433d61bbc Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 5 May 2010 10:59:44 +0800 Subject: mesa: Fix build of ES overlay. ES overlay is built with FEATURE_ES1 or FEATURE_ES2, and is built without FEATURE_GL. Fix the build by always building OpenGL ES sources, but test for FEATURE_ES1 or FEATURE_ES2. Also, define symbols that are missing because FEATURE_GL is not defined. --- src/mesa/sources.mak | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/mesa/sources.mak') diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index be859e43256..02f65cb9c27 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -1,11 +1,10 @@ ### Lists of source files, included by Makefiles -ES1_SOURCES = \ +# this is part of MAIN_SOURCES +MAIN_ES_SOURCES = \ main/api_exec_es1.c \ - main/get_es1.c - -ES2_SOURCES = \ main/api_exec_es2.c \ + main/get_es1.c \ main/get_es2.c MAIN_SOURCES = \ @@ -96,7 +95,7 @@ MAIN_SOURCES = \ main/version.c \ main/viewport.c \ main/vtxfmt.c \ - $(ES_SOURCES) + $(MAIN_ES_SOURCES) GLAPI_SOURCES = \ glapi/glapi.c \ -- cgit v1.2.3