isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: don't include deps/glib headers if glib enabled

Browse Source 
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:
Robert Bragg
2012-09-24 16:42:44 +01:00
parent 1c0c1a126a
commit ab72a2275f
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/conform/Makefile.am
View File

@ -110,8 +110,11 @@ BUILT_SOURCES = wrappers
# testing (such as test-bitmask) will still compile
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/cogl \
-I$(top_builddir)/deps/glib
-I$(top_builddir)/cogl
if !USE_GLIB
INCLUDES += -I$(top_builddir)/deps/glib
endif
test_conformance_CPPFLAGS = \
-DCOGL_ENABLE_EXPERIMENTAL_API \