mirror of
https://github.com/brl/mutter.git
synced 2025-07-10 20:47:19 +00:00
build: don't include deps/glib headers if glib enabled
If we're using the system glib library then we need to make sure not to include headers under deps/glib otherwise we end up with with incompatible typedefs that break the build. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5d5fc97b59951ec56a4193b7ee7909ebd3cfbb94)
This commit is contained in:
@ -8,8 +8,11 @@ lib_LTLIBRARIES = libcogl-gles2.la
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
-I$(top_builddir)/deps/glib
|
||||
-I$(top_builddir)
|
||||
|
||||
if !USE_GLIB
|
||||
INCLUDES += -I$(top_builddir)/deps/glib
|
||||
endif
|
||||
|
||||
AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
|
||||
|
||||
|
Reference in New Issue
Block a user