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:
parent
1c0c1a126a
commit
ab72a2275f
@ -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)
|
||||
|
||||
|
@ -18,7 +18,6 @@ lib_LTLIBRARIES =
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
-I$(top_builddir)/deps/glib \
|
||||
-I$(srcdir)/tesselator \
|
||||
-I$(srcdir)/winsys \
|
||||
-I$(srcdir)/driver/gl \
|
||||
@ -26,6 +25,10 @@ INCLUDES = \
|
||||
-I$(srcdir)/driver/gl/gles \
|
||||
$(NULL)
|
||||
|
||||
if !USE_GLIB
|
||||
INCLUDES += -I$(top_builddir)/deps/glib
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-DG_LOG_DOMAIN=\"Cogl\" \
|
||||
-DCOGL_COMPILATION \
|
||||
|
@ -1,8 +1,11 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir)/deps/glib
|
||||
-I$(top_srcdir)
|
||||
|
||||
if !USE_GLIB
|
||||
INCLUDES += -I$(top_builddir)/deps/glib
|
||||
endif
|
||||
|
||||
AM_CFLAGS = \
|
||||
$(COGL_DEP_CFLAGS) \
|
||||
@ -17,9 +20,12 @@ endif
|
||||
|
||||
common_ldadd = \
|
||||
$(COGL_DEP_LIBS) \
|
||||
$(top_builddir)/deps/glib/libglib.la \
|
||||
$(top_builddir)/cogl/libcogl.la
|
||||
|
||||
if !USE_GLIB
|
||||
common_ldadd += $(top_builddir)/deps/glib/libglib.la
|
||||
endif
|
||||
|
||||
programs = cogl-info
|
||||
|
||||
cogl_info_SOURCES = cogl-info.c
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user