isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Always build CoglPath support

Browse Source
This commit is contained in:
Jonas Ådahl 2018-05-03 20:46:53 +02:00
parent 46942c24a3
commit fba7d8c79c
5 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/Makefile.am
View File

@ -2,9 +2,7 @@ SUBDIRS = test-fixtures
SUBDIRS += cogl SUBDIRS += cogl
if BUILD_COGL_PATH
SUBDIRS += cogl-path SUBDIRS += cogl-path
endif
if BUILD_COGL_PANGO if BUILD_COGL_PANGO
SUBDIRS += cogl-pango SUBDIRS += cogl-pango

3
cogl/cogl/cogl.h
View File

@ -148,8 +148,7 @@
* cogl-path now gets built after cogl and some cogl-path headers are * cogl-path now gets built after cogl and some cogl-path headers are
* only generated at build time... * only generated at build time...
*/ */
#if defined (COGL_HAS_COGL_PATH_SUPPORT) && \ #if !defined (COGL_COMPILATION) && \
!defined (COGL_COMPILATION) && \
!defined (COGL_GIR_SCANNING) !defined (COGL_GIR_SCANNING)
#include <cogl-path/cogl-path.h> #include <cogl-path/cogl-path.h>
#endif #endif

19
cogl/configure.ac
View File

@ -401,22 +401,6 @@ AS_IF([test "x$enable_cogl_pango" = "xyes"],
] ]
) )
dnl ============================================================
dnl Should cogl-path be built?
dnl ============================================================
AC_ARG_ENABLE(
[cogl-path],
[AC_HELP_STRING([--enable-cogl-path=@<:@no/yes@:>@], [Enable 2D path support @<:@default=yes@:>@])],
[],
enable_cogl_path=yes
)
AS_IF([test "x$enable_cogl_path" = "xyes"],
[
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_COGL_PATH_SUPPORT"
]
)
dnl ============================================================ dnl ============================================================
dnl Choose image loading backend dnl Choose image loading backend
dnl ============================================================ dnl ============================================================
@ -828,8 +812,6 @@ AS_IF([test "x$enable_cogl_pango" = "xyes"],
) )
AM_CONDITIONAL([BUILD_COGL_PANGO], [test "x$enable_cogl_pango" = "xyes"]) AM_CONDITIONAL([BUILD_COGL_PANGO], [test "x$enable_cogl_pango" = "xyes"])
AM_CONDITIONAL([BUILD_COGL_PATH], [test "x$enable_cogl_path" = "xyes"])
dnl ================================================================ dnl ================================================================
dnl Misc program dependencies. dnl Misc program dependencies.
dnl ================================================================ dnl ================================================================
@ -1002,7 +984,6 @@ fi
echo " Build libcogl-gles2 GLES 2.0 frontend api: ${enable_cogl_gles2}" echo " Build libcogl-gles2 GLES 2.0 frontend api: ${enable_cogl_gles2}"
echo " Image backend: ${COGL_IMAGE_BACKEND}" echo " Image backend: ${COGL_IMAGE_BACKEND}"
echo " Cogl Pango: ${enable_cogl_pango}" echo " Cogl Pango: ${enable_cogl_pango}"
echo " Cogl Path: ${enable_cogl_path}"
# Compiler/Debug related flags # Compiler/Debug related flags
echo "" echo ""

4
cogl/tests/conform/Makefile.am
View File

@ -69,11 +69,9 @@ test_sources = \
test-fence.c \ test-fence.c \
$(NULL) $(NULL)
if BUILD_COGL_PATH
test_sources += \ test_sources += \
test-path.c \ test-path.c \
test-path-clip.c test-path-clip.c
endif
test_conformance_SOURCES = $(common_sources) $(test_sources) test_conformance_SOURCES = $(common_sources) $(test_sources)
@ -133,9 +131,7 @@ test_conformance_LDADD = \
$(COGL_DEP_LIBS) \ $(COGL_DEP_LIBS) \
$(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \ $(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \
$(LIBM) $(LIBM)
if BUILD_COGL_PATH
test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la
endif
test_conformance_LDFLAGS = -export-dynamic test_conformance_LDFLAGS = -export-dynamic
# XXX: uncomment when tests get fixed # XXX: uncomment when tests get fixed

2
cogl/tests/conform/test-conform-main.c
View File

@ -57,10 +57,8 @@ main (int argc, char **argv)
ADD_TEST (test_blend, 0, 0); ADD_TEST (test_blend, 0, 0);
ADD_TEST (test_premult, 0, TEST_KNOWN_FAILURE); ADD_TEST (test_premult, 0, TEST_KNOWN_FAILURE);
UNPORTED_TEST (test_readpixels); UNPORTED_TEST (test_readpixels);
#ifdef COGL_HAS_COGL_PATH_SUPPORT
ADD_TEST (test_path, 0, 0); ADD_TEST (test_path, 0, 0);
ADD_TEST (test_path_clip, 0, 0); ADD_TEST (test_path_clip, 0, 0);
#endif
ADD_TEST (test_depth_test, 0, 0); ADD_TEST (test_depth_test, 0, 0);
ADD_TEST (test_color_mask, 0, 0); ADD_TEST (test_color_mask, 0, 0);
ADD_TEST (test_backface_culling, 0, TEST_REQUIREMENT_NPOT); ADD_TEST (test_backface_culling, 0, TEST_REQUIREMENT_NPOT);