diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-05-02 14:09:52 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-05-02 14:09:52 -0400 |
| commit | da76a4d845367242c1ae7726d1dc23900f31e1e4 (patch) | |
| tree | ff45a40eb51a1020f6782e4b44bdddbfec38854e | |
| parent | 559d124ed3f2070c73c5cb9c3b506ddd9cfaeb02 (diff) | |
mesa: Only compile ES files when ES1 or ES2 are selected
This still requieres manual generation of the es1 and es2 glapis and is
disabled by default.
| -rw-r--r-- | configs/autoconf.in | 3 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 15 |
3 files changed, 18 insertions, 6 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index eeb99780be..119aadb6d4 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -33,9 +33,10 @@ LLVM_LDFLAGS = @LLVM_LDFLAGS@ LLVM_LIBS = @LLVM_LIBS@ -# Assembler +# Source selection MESA_ASM_SOURCES = @MESA_ASM_SOURCES@ GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@ +ES_SOURCES = @ES1_SOURCES@ @ES2_SOURCES@ # Misc tools and flags MAKE = @MAKE@ diff --git a/configure.ac b/configure.ac index 2811ec9e40..ef8a7eef82 100644 --- a/configure.ac +++ b/configure.ac @@ -745,6 +745,8 @@ AC_ARG_ENABLE([gles2], API_DEFINES="" APIS="" +ES1_SOURCES="" +ES2_SOURCES="" if test "x$enable_opengl" = xno; then API_DEFINES="$API_DEFINES -DFEATURE_GL=0" else @@ -754,16 +756,20 @@ fi if test "x$enable_gles1" = xyes; then API_DEFINES="$API_DEFINES -DFEATURE_ES1=1" APIS="$APIS es1" + ES1_SOURCES='$(ES1_SOURCES)' fi if test "x$enable_gles2" = xyes; then API_DEFINES="$API_DEFINES -DFEATURE_ES2=1" APIS="$APIS es2" + ES2_SOURCES='$(ES2_SOURCES)' fi if test "x$enable_gles1" = xyes -o "x$enable_gles2"; then SRC_DIRS="$SRC_DIRS gles" fi AC_SUBST([API_DEFINES]) AC_SUBST([APIS]) +AC_SUBST([ES1_SOURCES]) +AC_SUBST([ES2_SOURCES]) dnl If $with_dri_drivers is yes, directories will be added through dnl platform checks diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 3b2dcad885..be859e4325 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -1,10 +1,16 @@ ### Lists of source files, included by Makefiles +ES1_SOURCES = \ + main/api_exec_es1.c \ + main/get_es1.c + +ES2_SOURCES = \ + main/api_exec_es2.c \ + main/get_es2.c + MAIN_SOURCES = \ main/api_arrayelt.c \ main/api_exec.c \ - main/api_exec_es1.c \ - main/api_exec_es2.c \ main/api_loopback.c \ main/api_noop.c \ main/api_validate.c \ @@ -40,8 +46,6 @@ MAIN_SOURCES = \ main/formats.c \ main/framebuffer.c \ main/get.c \ - main/get_es1.c \ - main/get_es2.c \ main/getstring.c \ main/hash.c \ main/hint.c \ @@ -91,7 +95,8 @@ MAIN_SOURCES = \ main/varray.c \ main/version.c \ main/viewport.c \ - main/vtxfmt.c + main/vtxfmt.c \ + $(ES_SOURCES) GLAPI_SOURCES = \ glapi/glapi.c \ |