norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: don't build shl_gl if GLES is disabled

Browse Source 
We required GL headers for shl_gl.h. Even though the linker strips all the
GL dependencies if it's disabled during compilation, we still require it
as build-time dependency. Avoid that by not including shl_gl in any non-GL
builds.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann 2014-04-22 08:36:50 +02:00
parent 3b6fb0f75f
commit e507a14113
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -214,9 +214,7 @@ libshl_la_SOURCES = \
src/shl_hook.h \
src/shl_misc.h \
src/shl_register.h \
src/shl_flagset.h \
src/shl_gl.h \
src/shl_gl_math.c
src/shl_flagset.h
libshl_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(XKBCOMMON_CFLAGS) \
@ -229,7 +227,7 @@ libshl_la_LIBADD = \
$(XKBCOMMON_LIBS)
if BUILD_HAVE_GLES2
libshl_la_SOURCES += src/shl_gl_shader.c
libshl_la_SOURCES += src/shl_gl.h src/shl_gl_shader.c src/shl_gl_math.c
libshl_la_CPPFLAGS += $(GLES2_CFLAGS)
libshl_la_LIBADD += $(GLES2_LIBS)
endif