isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't build cogl-gles2-gears if configured with --disable-cogl-gles2

Browse Source 
The cogl-gles2-gears example will fail to build unless
--enable-cogl-gles2 is enabled in the configure script because it
depends on libcogl-gles2. This patch makes it only conditionally build
the example depending on the BUILD_COGL_GLES2 automake conditional.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 7f57e9c444b6353ac17e920ea4fc63ebe3cc29d3)
This commit is contained in:
Neil Roberts 2012-05-18 11:02:49 +01:00 committed by Robert Bragg
parent 498937083e
commit 59ffa9abdd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/Makefile.am
View File

@ -24,7 +24,7 @@ cogl_info_SOURCES = cogl-info.c
cogl_info_LDADD = $(common_ldadd) cogl_info_LDADD = $(common_ldadd)
if USE_GLIB if USE_GLIB
programs += cogl-hello cogl-msaa cogl-gles2-context cogl-gles2-gears programs += cogl-hello cogl-msaa cogl-gles2-context
examples_datadir = $(pkgdatadir)/examples-data examples_datadir = $(pkgdatadir)/examples-data
examples_data_DATA = examples_data_DATA =
@ -66,9 +66,12 @@ endif
cogl_gles2_context_SOURCES = cogl-gles2-context.c cogl_gles2_context_SOURCES = cogl-gles2-context.c
cogl_gles2_context_LDADD = $(common_ldadd) cogl_gles2_context_LDADD = $(common_ldadd)
if BUILD_COGL_GLES2
programs += cogl-gles2-gears
cogl_gles2_gears_SOURCES = cogl-gles2-gears.c cogl_gles2_gears_SOURCES = cogl-gles2-gears.c
cogl_gles2_gears_CFLAGS = -I$(top_srcdir)/cogl-gles2 $(AM_CFLAGS) cogl_gles2_gears_CFLAGS = -I$(top_srcdir)/cogl-gles2 $(AM_CFLAGS)
cogl_gles2_gears_LDADD = $(common_ldadd) $(top_builddir)/cogl-gles2/libcogl-gles2.la cogl_gles2_gears_LDADD = $(common_ldadd) $(top_builddir)/cogl-gles2/libcogl-gles2.la
endif
endif #USE_GLIB endif #USE_GLIB