From 599141a96b68262022a281dbb7c225fd68d57b18 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Sun, 8 Nov 2015 23:25:31 +0100 Subject: [PATCH] ector: move freetype rasterizer library to itw own directory. --- src/Makefile_Ector.am | 15 ++++++++------- .../freetype}/sw_ft_math.c | 0 .../freetype}/sw_ft_math.h | 0 .../freetype}/sw_ft_raster.c | 0 .../freetype}/sw_ft_raster.h | 0 .../freetype}/sw_ft_stroker.c | 0 .../freetype}/sw_ft_stroker.h | 0 .../freetype}/sw_ft_types.h | 0 8 files changed, 8 insertions(+), 7 deletions(-) rename src/{lib/ector/software => static_libs/freetype}/sw_ft_math.c (100%) rename src/{lib/ector/software => static_libs/freetype}/sw_ft_math.h (100%) rename src/{lib/ector/software => static_libs/freetype}/sw_ft_raster.c (100%) rename src/{lib/ector/software => static_libs/freetype}/sw_ft_raster.h (100%) rename src/{lib/ector/software => static_libs/freetype}/sw_ft_stroker.c (100%) rename src/{lib/ector/software => static_libs/freetype}/sw_ft_stroker.h (100%) rename src/{lib/ector/software => static_libs/freetype}/sw_ft_types.h (100%) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index 18c60a3931..be340cfa3f 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -92,9 +92,9 @@ lib/ector/software/ector_renderer_software_shape.c \ lib/ector/software/ector_software_gradient.c \ lib/ector/software/ector_software_rasterizer.c \ lib/ector/software/ector_software_surface.c \ -lib/ector/software/sw_ft_math.c \ -lib/ector/software/sw_ft_raster.c \ -lib/ector/software/sw_ft_stroker.c \ +static_libs/freetype/sw_ft_math.c \ +static_libs/freetype/sw_ft_raster.c \ +static_libs/freetype/sw_ft_stroker.c \ lib/ector/software/ector_drawhelper.c \ lib/ector/software/ector_drawhelper_sse2.c \ lib/ector/software/ector_drawhelper_neon.c @@ -106,6 +106,7 @@ lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_builddir)/src/lib/ector \ -I$(top_builddir)/src/lib/ector/cairo \ -I$(top_builddir)/src/lib/ector/software \ +-I$(top_builddir)/src/static_libs/freetype \ @ECTOR_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @@ -152,7 +153,7 @@ lib/ector/ector_private.h \ lib/ector/cairo/ector_cairo_private.h \ lib/ector/software/ector_drawhelper_private.h \ lib/ector/software/ector_software_private.h \ -lib/ector/software/sw_ft_math.h \ -lib/ector/software/sw_ft_raster.h \ -lib/ector/software/sw_ft_stroker.h \ -lib/ector/software/sw_ft_types.h +static_libs/freetype/sw_ft_math.h \ +static_libs/freetype/sw_ft_raster.h \ +static_libs/freetype/sw_ft_stroker.h \ +static_libs/freetype/sw_ft_types.h diff --git a/src/lib/ector/software/sw_ft_math.c b/src/static_libs/freetype/sw_ft_math.c similarity index 100% rename from src/lib/ector/software/sw_ft_math.c rename to src/static_libs/freetype/sw_ft_math.c diff --git a/src/lib/ector/software/sw_ft_math.h b/src/static_libs/freetype/sw_ft_math.h similarity index 100% rename from src/lib/ector/software/sw_ft_math.h rename to src/static_libs/freetype/sw_ft_math.h diff --git a/src/lib/ector/software/sw_ft_raster.c b/src/static_libs/freetype/sw_ft_raster.c similarity index 100% rename from src/lib/ector/software/sw_ft_raster.c rename to src/static_libs/freetype/sw_ft_raster.c diff --git a/src/lib/ector/software/sw_ft_raster.h b/src/static_libs/freetype/sw_ft_raster.h similarity index 100% rename from src/lib/ector/software/sw_ft_raster.h rename to src/static_libs/freetype/sw_ft_raster.h diff --git a/src/lib/ector/software/sw_ft_stroker.c b/src/static_libs/freetype/sw_ft_stroker.c similarity index 100% rename from src/lib/ector/software/sw_ft_stroker.c rename to src/static_libs/freetype/sw_ft_stroker.c diff --git a/src/lib/ector/software/sw_ft_stroker.h b/src/static_libs/freetype/sw_ft_stroker.h similarity index 100% rename from src/lib/ector/software/sw_ft_stroker.h rename to src/static_libs/freetype/sw_ft_stroker.h diff --git a/src/lib/ector/software/sw_ft_types.h b/src/static_libs/freetype/sw_ft_types.h similarity index 100% rename from src/lib/ector/software/sw_ft_types.h rename to src/static_libs/freetype/sw_ft_types.h