diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 25f12fffc..f9c97724a 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -2,9 +2,7 @@ SUBDIRS = test-fixtures SUBDIRS += cogl -if BUILD_COGL_PATH SUBDIRS += cogl-path -endif if BUILD_COGL_PANGO SUBDIRS += cogl-pango diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index 5210e3c59..565ea289a 100644 --- a/cogl/cogl/cogl.h +++ b/cogl/cogl/cogl.h @@ -148,8 +148,7 @@ * cogl-path now gets built after cogl and some cogl-path headers are * only generated at build time... */ -#if defined (COGL_HAS_COGL_PATH_SUPPORT) && \ - !defined (COGL_COMPILATION) && \ +#if !defined (COGL_COMPILATION) && \ !defined (COGL_GIR_SCANNING) #include #endif diff --git a/cogl/configure.ac b/cogl/configure.ac index 7566d7fc9..f04f1e356 100644 --- a/cogl/configure.ac +++ b/cogl/configure.ac @@ -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 Choose image loading backend 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_PATH], [test "x$enable_cogl_path" = "xyes"]) - dnl ================================================================ dnl Misc program dependencies. dnl ================================================================ @@ -1002,7 +984,6 @@ fi echo " Build libcogl-gles2 GLES 2.0 frontend api: ${enable_cogl_gles2}" echo " Image backend: ${COGL_IMAGE_BACKEND}" echo " Cogl Pango: ${enable_cogl_pango}" -echo " Cogl Path: ${enable_cogl_path}" # Compiler/Debug related flags echo "" diff --git a/cogl/tests/conform/Makefile.am b/cogl/tests/conform/Makefile.am index 2ce0f9841..f32fac226 100644 --- a/cogl/tests/conform/Makefile.am +++ b/cogl/tests/conform/Makefile.am @@ -69,11 +69,9 @@ test_sources = \ test-fence.c \ $(NULL) -if BUILD_COGL_PATH test_sources += \ test-path.c \ test-path-clip.c -endif test_conformance_SOURCES = $(common_sources) $(test_sources) @@ -133,9 +131,7 @@ test_conformance_LDADD = \ $(COGL_DEP_LIBS) \ $(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \ $(LIBM) -if BUILD_COGL_PATH test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la -endif test_conformance_LDFLAGS = -export-dynamic # XXX: uncomment when tests get fixed diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c index 64fdfba01..a21d912bf 100644 --- a/cogl/tests/conform/test-conform-main.c +++ b/cogl/tests/conform/test-conform-main.c @@ -57,10 +57,8 @@ main (int argc, char **argv) ADD_TEST (test_blend, 0, 0); ADD_TEST (test_premult, 0, TEST_KNOWN_FAILURE); UNPORTED_TEST (test_readpixels); -#ifdef COGL_HAS_COGL_PATH_SUPPORT ADD_TEST (test_path, 0, 0); ADD_TEST (test_path_clip, 0, 0); -#endif ADD_TEST (test_depth_test, 0, 0); ADD_TEST (test_color_mask, 0, 0); ADD_TEST (test_backface_culling, 0, TEST_REQUIREMENT_NPOT);