From 65c901e41f5c8a79638bae2192ec418987ab9f70 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 17 Jul 2012 13:41:21 +0200 Subject: [PATCH] try to simplify makefiles --- Android.mk | 27 +--------- Generic.mk | 31 +++++++++++ Linux.mk | 27 +--------- {agg-2.4 => agg}/agg_alpha_mask_u8.h | 0 {agg-2.4 => agg}/agg_arc.cpp | 0 {agg-2.4 => agg}/agg_arc.h | 0 {agg-2.4 => agg}/agg_array.h | 0 {agg-2.4 => agg}/agg_arrowhead.cpp | 0 {agg-2.4 => agg}/agg_arrowhead.h | 0 {agg-2.4 => agg}/agg_basics.h | 0 {agg-2.4 => agg}/agg_bezier_arc.cpp | 0 {agg-2.4 => agg}/agg_bezier_arc.h | 0 {agg-2.4 => agg}/agg_bitset_iterator.h | 0 {agg-2.4 => agg}/agg_blur.h | 0 {agg-2.4 => agg}/agg_bounding_rect.h | 0 {agg-2.4 => agg}/agg_bspline.cpp | 0 {agg-2.4 => agg}/agg_bspline.h | 0 {agg-2.4 => agg}/agg_clip_liang_barsky.h | 0 {agg-2.4 => agg}/agg_color_gray.h | 0 {agg-2.4 => agg}/agg_color_rgba.h | 0 {agg-2.4 => agg}/agg_config.h | 0 {agg-2.4 => agg}/agg_conv_adaptor_vcgen.h | 0 {agg-2.4 => agg}/agg_conv_adaptor_vpgen.h | 0 {agg-2.4 => agg}/agg_conv_bspline.h | 0 {agg-2.4 => agg}/agg_conv_clip_polygon.h | 0 {agg-2.4 => agg}/agg_conv_clip_polyline.h | 0 {agg-2.4 => agg}/agg_conv_close_polygon.h | 0 {agg-2.4 => agg}/agg_conv_concat.h | 0 {agg-2.4 => agg}/agg_conv_contour.h | 0 {agg-2.4 => agg}/agg_conv_curve.h | 0 {agg-2.4 => agg}/agg_conv_dash.h | 0 {agg-2.4 => agg}/agg_conv_gpc.h | 0 {agg-2.4 => agg}/agg_conv_marker.h | 0 {agg-2.4 => agg}/agg_conv_marker_adaptor.h | 0 {agg-2.4 => agg}/agg_conv_segmentator.h | 0 {agg-2.4 => agg}/agg_conv_shorten_path.h | 0 {agg-2.4 => agg}/agg_conv_smooth_poly1.h | 0 {agg-2.4 => agg}/agg_conv_stroke.h | 0 {agg-2.4 => agg}/agg_conv_transform.h | 0 {agg-2.4 => agg}/agg_conv_unclose_polygon.h | 0 {agg-2.4 => agg}/agg_curves.cpp | 0 {agg-2.4 => agg}/agg_curves.h | 0 {agg-2.4 => agg}/agg_dda_line.h | 0 {agg-2.4 => agg}/agg_ellipse.h | 0 {agg-2.4 => agg}/agg_ellipse_bresenham.h | 0 .../agg_embedded_raster_fonts.cpp | 0 {agg-2.4 => agg}/agg_embedded_raster_fonts.h | 0 {agg-2.4 => agg}/agg_font_cache_manager.h | 0 {agg-2.4 => agg}/agg_font_freetype.cpp | 0 {agg-2.4 => agg}/agg_font_freetype.h | 0 {agg-2.4 => agg}/agg_gamma_functions.h | 0 {agg-2.4 => agg}/agg_gamma_lut.h | 0 {agg-2.4 => agg}/agg_glyph_raster_bin.h | 0 {agg-2.4 => agg}/agg_gradient_lut.h | 0 {agg-2.4 => agg}/agg_gsv_text.cpp | 0 {agg-2.4 => agg}/agg_gsv_text.h | 0 {agg-2.4 => agg}/agg_image_accessors.h | 0 {agg-2.4 => agg}/agg_image_filters.cpp | 0 {agg-2.4 => agg}/agg_image_filters.h | 0 {agg-2.4 => agg}/agg_line_aa_basics.cpp | 0 {agg-2.4 => agg}/agg_line_aa_basics.h | 0 {agg-2.4 => agg}/agg_line_profile_aa.cpp | 0 {agg-2.4 => agg}/agg_math.h | 0 {agg-2.4 => agg}/agg_math_stroke.h | 0 {agg-2.4 => agg}/agg_path_length.h | 0 {agg-2.4 => agg}/agg_path_storage.h | 0 {agg-2.4 => agg}/agg_path_storage_integer.h | 0 {agg-2.4 => agg}/agg_pattern_filters_rgba.h | 0 {agg-2.4 => agg}/agg_pixfmt_amask_adaptor.h | 0 {agg-2.4 => agg}/agg_pixfmt_gray.h | 0 {agg-2.4 => agg}/agg_pixfmt_rgb.h | 0 {agg-2.4 => agg}/agg_pixfmt_rgb_packed.h | 0 {agg-2.4 => agg}/agg_pixfmt_rgba.h | 0 {agg-2.4 => agg}/agg_pixfmt_transposer.h | 0 {agg-2.4 => agg}/agg_rasterizer_cells_aa.h | 0 {agg-2.4 => agg}/agg_rasterizer_compound_aa.h | 0 {agg-2.4 => agg}/agg_rasterizer_outline.h | 0 {agg-2.4 => agg}/agg_rasterizer_outline_aa.h | 0 {agg-2.4 => agg}/agg_rasterizer_scanline_aa.h | 0 {agg-2.4 => agg}/agg_rasterizer_sl_clip.h | 0 {agg-2.4 => agg}/agg_renderer_base.h | 0 {agg-2.4 => agg}/agg_renderer_markers.h | 0 {agg-2.4 => agg}/agg_renderer_mclip.h | 0 {agg-2.4 => agg}/agg_renderer_outline_aa.h | 0 {agg-2.4 => agg}/agg_renderer_outline_image.h | 0 {agg-2.4 => agg}/agg_renderer_primitives.h | 0 {agg-2.4 => agg}/agg_renderer_raster_text.h | 0 {agg-2.4 => agg}/agg_renderer_scanline.h | 0 {agg-2.4 => agg}/agg_rendering_buffer.h | 0 .../agg_rendering_buffer_dynarow.h | 0 {agg-2.4 => agg}/agg_rounded_rect.cpp | 0 {agg-2.4 => agg}/agg_rounded_rect.h | 0 {agg-2.4 => agg}/agg_scanline_bin.h | 0 .../agg_scanline_boolean_algebra.h | 0 {agg-2.4 => agg}/agg_scanline_p.h | 0 {agg-2.4 => agg}/agg_scanline_storage_aa.h | 0 {agg-2.4 => agg}/agg_scanline_storage_bin.h | 0 {agg-2.4 => agg}/agg_scanline_u.h | 0 {agg-2.4 => agg}/agg_shorten_path.h | 0 {agg-2.4 => agg}/agg_simul_eq.h | 0 {agg-2.4 => agg}/agg_span_allocator.h | 0 {agg-2.4 => agg}/agg_span_converter.h | 0 {agg-2.4 => agg}/agg_span_gouraud.h | 0 {agg-2.4 => agg}/agg_span_gouraud_gray.h | 0 {agg-2.4 => agg}/agg_span_gouraud_rgba.h | 0 {agg-2.4 => agg}/agg_span_gradient.h | 0 {agg-2.4 => agg}/agg_span_gradient_alpha.h | 0 {agg-2.4 => agg}/agg_span_image_filter.h | 0 {agg-2.4 => agg}/agg_span_image_filter_gray.h | 0 {agg-2.4 => agg}/agg_span_image_filter_rgb.h | 0 {agg-2.4 => agg}/agg_span_image_filter_rgba.h | 0 .../agg_span_interpolator_adaptor.h | 0 .../agg_span_interpolator_linear.h | 0 .../agg_span_interpolator_persp.h | 0 .../agg_span_interpolator_trans.h | 0 {agg-2.4 => agg}/agg_span_pattern_gray.h | 0 {agg-2.4 => agg}/agg_span_pattern_rgb.h | 0 {agg-2.4 => agg}/agg_span_pattern_rgba.h | 0 {agg-2.4 => agg}/agg_span_solid.h | 0 {agg-2.4 => agg}/agg_span_subdiv_adaptor.h | 0 {agg-2.4 => agg}/agg_sqrt_tables.cpp | 0 {agg-2.4 => agg}/agg_trans_affine.cpp | 0 {agg-2.4 => agg}/agg_trans_affine.h | 0 {agg-2.4 => agg}/agg_trans_bilinear.h | 0 {agg-2.4 => agg}/agg_trans_double_path.cpp | 0 {agg-2.4 => agg}/agg_trans_double_path.h | 0 {agg-2.4 => agg}/agg_trans_perspective.h | 0 {agg-2.4 => agg}/agg_trans_single_path.cpp | 0 {agg-2.4 => agg}/agg_trans_single_path.h | 0 {agg-2.4 => agg}/agg_trans_viewport.h | 0 {agg-2.4 => agg}/agg_trans_warp_magnifier.cpp | 0 {agg-2.4 => agg}/agg_trans_warp_magnifier.h | 0 {agg-2.4 => agg}/agg_vcgen_bspline.cpp | 0 {agg-2.4 => agg}/agg_vcgen_bspline.h | 0 {agg-2.4 => agg}/agg_vcgen_contour.cpp | 0 {agg-2.4 => agg}/agg_vcgen_contour.h | 0 {agg-2.4 => agg}/agg_vcgen_dash.cpp | 0 {agg-2.4 => agg}/agg_vcgen_dash.h | 0 {agg-2.4 => agg}/agg_vcgen_markers_term.cpp | 0 {agg-2.4 => agg}/agg_vcgen_markers_term.h | 0 {agg-2.4 => agg}/agg_vcgen_smooth_poly1.cpp | 0 {agg-2.4 => agg}/agg_vcgen_smooth_poly1.h | 0 {agg-2.4 => agg}/agg_vcgen_stroke.cpp | 0 {agg-2.4 => agg}/agg_vcgen_stroke.h | 0 {agg-2.4 => agg}/agg_vcgen_vertex_sequence.h | 0 {agg-2.4 => agg}/agg_vertex_sequence.h | 0 {agg-2.4 => agg}/agg_vpgen_clip_polygon.cpp | 0 {agg-2.4 => agg}/agg_vpgen_clip_polygon.h | 0 {agg-2.4 => agg}/agg_vpgen_clip_polyline.cpp | 0 {agg-2.4 => agg}/agg_vpgen_clip_polyline.h | 0 {agg-2.4 => agg}/agg_vpgen_segmentator.cpp | 0 {agg-2.4 => agg}/agg_vpgen_segmentator.h | 0 {agg-2.4 => agg}/util/agg_color_conv.h | 0 {agg-2.4 => agg}/util/agg_color_conv_rgb16.h | 0 {agg-2.4 => agg}/util/agg_color_conv_rgb8.h | 0 file.mk | 54 +++++++++---------- 156 files changed, 62 insertions(+), 77 deletions(-) create mode 100644 Generic.mk rename {agg-2.4 => agg}/agg_alpha_mask_u8.h (100%) rename {agg-2.4 => agg}/agg_arc.cpp (100%) rename {agg-2.4 => agg}/agg_arc.h (100%) rename {agg-2.4 => agg}/agg_array.h (100%) rename {agg-2.4 => agg}/agg_arrowhead.cpp (100%) rename {agg-2.4 => agg}/agg_arrowhead.h (100%) rename {agg-2.4 => agg}/agg_basics.h (100%) rename {agg-2.4 => agg}/agg_bezier_arc.cpp (100%) rename {agg-2.4 => agg}/agg_bezier_arc.h (100%) rename {agg-2.4 => agg}/agg_bitset_iterator.h (100%) rename {agg-2.4 => agg}/agg_blur.h (100%) rename {agg-2.4 => agg}/agg_bounding_rect.h (100%) rename {agg-2.4 => agg}/agg_bspline.cpp (100%) rename {agg-2.4 => agg}/agg_bspline.h (100%) rename {agg-2.4 => agg}/agg_clip_liang_barsky.h (100%) rename {agg-2.4 => agg}/agg_color_gray.h (100%) rename {agg-2.4 => agg}/agg_color_rgba.h (100%) rename {agg-2.4 => agg}/agg_config.h (100%) rename {agg-2.4 => agg}/agg_conv_adaptor_vcgen.h (100%) rename {agg-2.4 => agg}/agg_conv_adaptor_vpgen.h (100%) rename {agg-2.4 => agg}/agg_conv_bspline.h (100%) rename {agg-2.4 => agg}/agg_conv_clip_polygon.h (100%) rename {agg-2.4 => agg}/agg_conv_clip_polyline.h (100%) rename {agg-2.4 => agg}/agg_conv_close_polygon.h (100%) rename {agg-2.4 => agg}/agg_conv_concat.h (100%) rename {agg-2.4 => agg}/agg_conv_contour.h (100%) rename {agg-2.4 => agg}/agg_conv_curve.h (100%) rename {agg-2.4 => agg}/agg_conv_dash.h (100%) rename {agg-2.4 => agg}/agg_conv_gpc.h (100%) rename {agg-2.4 => agg}/agg_conv_marker.h (100%) rename {agg-2.4 => agg}/agg_conv_marker_adaptor.h (100%) rename {agg-2.4 => agg}/agg_conv_segmentator.h (100%) rename {agg-2.4 => agg}/agg_conv_shorten_path.h (100%) rename {agg-2.4 => agg}/agg_conv_smooth_poly1.h (100%) rename {agg-2.4 => agg}/agg_conv_stroke.h (100%) rename {agg-2.4 => agg}/agg_conv_transform.h (100%) rename {agg-2.4 => agg}/agg_conv_unclose_polygon.h (100%) rename {agg-2.4 => agg}/agg_curves.cpp (100%) rename {agg-2.4 => agg}/agg_curves.h (100%) rename {agg-2.4 => agg}/agg_dda_line.h (100%) rename {agg-2.4 => agg}/agg_ellipse.h (100%) rename {agg-2.4 => agg}/agg_ellipse_bresenham.h (100%) rename {agg-2.4 => agg}/agg_embedded_raster_fonts.cpp (100%) rename {agg-2.4 => agg}/agg_embedded_raster_fonts.h (100%) rename {agg-2.4 => agg}/agg_font_cache_manager.h (100%) rename {agg-2.4 => agg}/agg_font_freetype.cpp (100%) rename {agg-2.4 => agg}/agg_font_freetype.h (100%) rename {agg-2.4 => agg}/agg_gamma_functions.h (100%) rename {agg-2.4 => agg}/agg_gamma_lut.h (100%) rename {agg-2.4 => agg}/agg_glyph_raster_bin.h (100%) rename {agg-2.4 => agg}/agg_gradient_lut.h (100%) rename {agg-2.4 => agg}/agg_gsv_text.cpp (100%) rename {agg-2.4 => agg}/agg_gsv_text.h (100%) rename {agg-2.4 => agg}/agg_image_accessors.h (100%) rename {agg-2.4 => agg}/agg_image_filters.cpp (100%) rename {agg-2.4 => agg}/agg_image_filters.h (100%) rename {agg-2.4 => agg}/agg_line_aa_basics.cpp (100%) rename {agg-2.4 => agg}/agg_line_aa_basics.h (100%) rename {agg-2.4 => agg}/agg_line_profile_aa.cpp (100%) rename {agg-2.4 => agg}/agg_math.h (100%) rename {agg-2.4 => agg}/agg_math_stroke.h (100%) rename {agg-2.4 => agg}/agg_path_length.h (100%) rename {agg-2.4 => agg}/agg_path_storage.h (100%) rename {agg-2.4 => agg}/agg_path_storage_integer.h (100%) rename {agg-2.4 => agg}/agg_pattern_filters_rgba.h (100%) rename {agg-2.4 => agg}/agg_pixfmt_amask_adaptor.h (100%) rename {agg-2.4 => agg}/agg_pixfmt_gray.h (100%) rename {agg-2.4 => agg}/agg_pixfmt_rgb.h (100%) rename {agg-2.4 => agg}/agg_pixfmt_rgb_packed.h (100%) rename {agg-2.4 => agg}/agg_pixfmt_rgba.h (100%) rename {agg-2.4 => agg}/agg_pixfmt_transposer.h (100%) rename {agg-2.4 => agg}/agg_rasterizer_cells_aa.h (100%) rename {agg-2.4 => agg}/agg_rasterizer_compound_aa.h (100%) rename {agg-2.4 => agg}/agg_rasterizer_outline.h (100%) rename {agg-2.4 => agg}/agg_rasterizer_outline_aa.h (100%) rename {agg-2.4 => agg}/agg_rasterizer_scanline_aa.h (100%) rename {agg-2.4 => agg}/agg_rasterizer_sl_clip.h (100%) rename {agg-2.4 => agg}/agg_renderer_base.h (100%) rename {agg-2.4 => agg}/agg_renderer_markers.h (100%) rename {agg-2.4 => agg}/agg_renderer_mclip.h (100%) rename {agg-2.4 => agg}/agg_renderer_outline_aa.h (100%) rename {agg-2.4 => agg}/agg_renderer_outline_image.h (100%) rename {agg-2.4 => agg}/agg_renderer_primitives.h (100%) rename {agg-2.4 => agg}/agg_renderer_raster_text.h (100%) rename {agg-2.4 => agg}/agg_renderer_scanline.h (100%) rename {agg-2.4 => agg}/agg_rendering_buffer.h (100%) rename {agg-2.4 => agg}/agg_rendering_buffer_dynarow.h (100%) rename {agg-2.4 => agg}/agg_rounded_rect.cpp (100%) rename {agg-2.4 => agg}/agg_rounded_rect.h (100%) rename {agg-2.4 => agg}/agg_scanline_bin.h (100%) rename {agg-2.4 => agg}/agg_scanline_boolean_algebra.h (100%) rename {agg-2.4 => agg}/agg_scanline_p.h (100%) rename {agg-2.4 => agg}/agg_scanline_storage_aa.h (100%) rename {agg-2.4 => agg}/agg_scanline_storage_bin.h (100%) rename {agg-2.4 => agg}/agg_scanline_u.h (100%) rename {agg-2.4 => agg}/agg_shorten_path.h (100%) rename {agg-2.4 => agg}/agg_simul_eq.h (100%) rename {agg-2.4 => agg}/agg_span_allocator.h (100%) rename {agg-2.4 => agg}/agg_span_converter.h (100%) rename {agg-2.4 => agg}/agg_span_gouraud.h (100%) rename {agg-2.4 => agg}/agg_span_gouraud_gray.h (100%) rename {agg-2.4 => agg}/agg_span_gouraud_rgba.h (100%) rename {agg-2.4 => agg}/agg_span_gradient.h (100%) rename {agg-2.4 => agg}/agg_span_gradient_alpha.h (100%) rename {agg-2.4 => agg}/agg_span_image_filter.h (100%) rename {agg-2.4 => agg}/agg_span_image_filter_gray.h (100%) rename {agg-2.4 => agg}/agg_span_image_filter_rgb.h (100%) rename {agg-2.4 => agg}/agg_span_image_filter_rgba.h (100%) rename {agg-2.4 => agg}/agg_span_interpolator_adaptor.h (100%) rename {agg-2.4 => agg}/agg_span_interpolator_linear.h (100%) rename {agg-2.4 => agg}/agg_span_interpolator_persp.h (100%) rename {agg-2.4 => agg}/agg_span_interpolator_trans.h (100%) rename {agg-2.4 => agg}/agg_span_pattern_gray.h (100%) rename {agg-2.4 => agg}/agg_span_pattern_rgb.h (100%) rename {agg-2.4 => agg}/agg_span_pattern_rgba.h (100%) rename {agg-2.4 => agg}/agg_span_solid.h (100%) rename {agg-2.4 => agg}/agg_span_subdiv_adaptor.h (100%) rename {agg-2.4 => agg}/agg_sqrt_tables.cpp (100%) rename {agg-2.4 => agg}/agg_trans_affine.cpp (100%) rename {agg-2.4 => agg}/agg_trans_affine.h (100%) rename {agg-2.4 => agg}/agg_trans_bilinear.h (100%) rename {agg-2.4 => agg}/agg_trans_double_path.cpp (100%) rename {agg-2.4 => agg}/agg_trans_double_path.h (100%) rename {agg-2.4 => agg}/agg_trans_perspective.h (100%) rename {agg-2.4 => agg}/agg_trans_single_path.cpp (100%) rename {agg-2.4 => agg}/agg_trans_single_path.h (100%) rename {agg-2.4 => agg}/agg_trans_viewport.h (100%) rename {agg-2.4 => agg}/agg_trans_warp_magnifier.cpp (100%) rename {agg-2.4 => agg}/agg_trans_warp_magnifier.h (100%) rename {agg-2.4 => agg}/agg_vcgen_bspline.cpp (100%) rename {agg-2.4 => agg}/agg_vcgen_bspline.h (100%) rename {agg-2.4 => agg}/agg_vcgen_contour.cpp (100%) rename {agg-2.4 => agg}/agg_vcgen_contour.h (100%) rename {agg-2.4 => agg}/agg_vcgen_dash.cpp (100%) rename {agg-2.4 => agg}/agg_vcgen_dash.h (100%) rename {agg-2.4 => agg}/agg_vcgen_markers_term.cpp (100%) rename {agg-2.4 => agg}/agg_vcgen_markers_term.h (100%) rename {agg-2.4 => agg}/agg_vcgen_smooth_poly1.cpp (100%) rename {agg-2.4 => agg}/agg_vcgen_smooth_poly1.h (100%) rename {agg-2.4 => agg}/agg_vcgen_stroke.cpp (100%) rename {agg-2.4 => agg}/agg_vcgen_stroke.h (100%) rename {agg-2.4 => agg}/agg_vcgen_vertex_sequence.h (100%) rename {agg-2.4 => agg}/agg_vertex_sequence.h (100%) rename {agg-2.4 => agg}/agg_vpgen_clip_polygon.cpp (100%) rename {agg-2.4 => agg}/agg_vpgen_clip_polygon.h (100%) rename {agg-2.4 => agg}/agg_vpgen_clip_polyline.cpp (100%) rename {agg-2.4 => agg}/agg_vpgen_clip_polyline.h (100%) rename {agg-2.4 => agg}/agg_vpgen_segmentator.cpp (100%) rename {agg-2.4 => agg}/agg_vpgen_segmentator.h (100%) rename {agg-2.4 => agg}/util/agg_color_conv.h (100%) rename {agg-2.4 => agg}/util/agg_color_conv_rgb16.h (100%) rename {agg-2.4 => agg}/util/agg_color_conv_rgb8.h (100%) diff --git a/Android.mk b/Android.mk index 14b495a..8e6007f 100644 --- a/Android.mk +++ b/Android.mk @@ -1,32 +1,9 @@ LOCAL_PATH := $(call my-dir) - include $(CLEAR_VARS) -# name of the librairy -LOCAL_MODULE := agg - -# name of the dependency -LOCAL_STATIC_LIBRARIES := libfreetype - -LOCAL_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/agg-2.4/ \ - $(LOCAL_PATH)/agg-2.4/util/ - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) - -ifeq ($(DEBUG),1) -LOCAL_CFLAGS := -D__PLATFORM__Android \ - -DAGG_DEBUG_LEVEL=3 \ - -DAGG_VERSION_TAG_NAME="\"2.4-debug\"" -else -LOCAL_CFLAGS := -D__PLATFORM__Android \ - -DAGG_DEBUG_LEVEL=3 \ - -DAGG_VERSION_TAG_NAME="\"2.4-release\"" -endif - # load the common sources file of the platform -include $(LOCAL_PATH)/file.mk +include $(LOCAL_PATH)/Generic.mk -LOCAL_SRC_FILES := $(FILE_LIST) +LOCAL_CFLAGS += -D__PLATFORM__Android include $(BUILD_STATIC_LIBRARY) diff --git a/Generic.mk b/Generic.mk new file mode 100644 index 0000000..31f6cff --- /dev/null +++ b/Generic.mk @@ -0,0 +1,31 @@ + +# get the tag of the current project : +LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags) +LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0) +$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG)) + +# name of the librairy +LOCAL_MODULE := agg + +# name of the dependency +LOCAL_STATIC_LIBRARIES := libfreetype + +LOCAL_C_INCLUDES := $(LOCAL_PATH) \ + $(LOCAL_PATH)/agg/ \ + $(LOCAL_PATH)/agg/util/ + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) + +ifeq ($(DEBUG),1) +LOCAL_CFLAGS := -DAGG_DEBUG_LEVEL=3 \ + -DAGG_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" +else +LOCAL_CFLAGS := -DAGG_DEBUG_LEVEL=3 \ + -DAGG_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" +endif + +# load the common sources file of the platform +include $(LOCAL_PATH)/file.mk + +LOCAL_SRC_FILES := $(FILE_LIST) + diff --git a/Linux.mk b/Linux.mk index bf06769..5eaa2d8 100644 --- a/Linux.mk +++ b/Linux.mk @@ -1,32 +1,9 @@ LOCAL_PATH := $(call my-dir) - include $(CLEAR_VARS) -# name of the librairy -LOCAL_MODULE := agg - -# name of the dependency -LOCAL_STATIC_LIBRARIES := libfreetype - -LOCAL_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/agg-2.4/ \ - $(LOCAL_PATH)/agg-2.4/util/ - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) - -ifeq ($(DEBUG),1) -LOCAL_CFLAGS := -D__PLATFORM__Linux \ - -DAGG_DEBUG_LEVEL=3 \ - -DAGG_VERSION_TAG_NAME="\"2.4-debug\"" -else -LOCAL_CFLAGS := -D__PLATFORM__Linux \ - -DAGG_DEBUG_LEVEL=3 \ - -DAGG_VERSION_TAG_NAME="\"2.4-release\"" -endif - # load the common sources file of the platform -include $(LOCAL_PATH)/file.mk +include $(LOCAL_PATH)/Generic.mk -LOCAL_SRC_FILES := $(FILE_LIST) +LOCAL_CFLAGS += -D__PLATFORM__Linux include $(BUILD_STATIC_LIBRARY) diff --git a/agg-2.4/agg_alpha_mask_u8.h b/agg/agg_alpha_mask_u8.h similarity index 100% rename from agg-2.4/agg_alpha_mask_u8.h rename to agg/agg_alpha_mask_u8.h diff --git a/agg-2.4/agg_arc.cpp b/agg/agg_arc.cpp similarity index 100% rename from agg-2.4/agg_arc.cpp rename to agg/agg_arc.cpp diff --git a/agg-2.4/agg_arc.h b/agg/agg_arc.h similarity index 100% rename from agg-2.4/agg_arc.h rename to agg/agg_arc.h diff --git a/agg-2.4/agg_array.h b/agg/agg_array.h similarity index 100% rename from agg-2.4/agg_array.h rename to agg/agg_array.h diff --git a/agg-2.4/agg_arrowhead.cpp b/agg/agg_arrowhead.cpp similarity index 100% rename from agg-2.4/agg_arrowhead.cpp rename to agg/agg_arrowhead.cpp diff --git a/agg-2.4/agg_arrowhead.h b/agg/agg_arrowhead.h similarity index 100% rename from agg-2.4/agg_arrowhead.h rename to agg/agg_arrowhead.h diff --git a/agg-2.4/agg_basics.h b/agg/agg_basics.h similarity index 100% rename from agg-2.4/agg_basics.h rename to agg/agg_basics.h diff --git a/agg-2.4/agg_bezier_arc.cpp b/agg/agg_bezier_arc.cpp similarity index 100% rename from agg-2.4/agg_bezier_arc.cpp rename to agg/agg_bezier_arc.cpp diff --git a/agg-2.4/agg_bezier_arc.h b/agg/agg_bezier_arc.h similarity index 100% rename from agg-2.4/agg_bezier_arc.h rename to agg/agg_bezier_arc.h diff --git a/agg-2.4/agg_bitset_iterator.h b/agg/agg_bitset_iterator.h similarity index 100% rename from agg-2.4/agg_bitset_iterator.h rename to agg/agg_bitset_iterator.h diff --git a/agg-2.4/agg_blur.h b/agg/agg_blur.h similarity index 100% rename from agg-2.4/agg_blur.h rename to agg/agg_blur.h diff --git a/agg-2.4/agg_bounding_rect.h b/agg/agg_bounding_rect.h similarity index 100% rename from agg-2.4/agg_bounding_rect.h rename to agg/agg_bounding_rect.h diff --git a/agg-2.4/agg_bspline.cpp b/agg/agg_bspline.cpp similarity index 100% rename from agg-2.4/agg_bspline.cpp rename to agg/agg_bspline.cpp diff --git a/agg-2.4/agg_bspline.h b/agg/agg_bspline.h similarity index 100% rename from agg-2.4/agg_bspline.h rename to agg/agg_bspline.h diff --git a/agg-2.4/agg_clip_liang_barsky.h b/agg/agg_clip_liang_barsky.h similarity index 100% rename from agg-2.4/agg_clip_liang_barsky.h rename to agg/agg_clip_liang_barsky.h diff --git a/agg-2.4/agg_color_gray.h b/agg/agg_color_gray.h similarity index 100% rename from agg-2.4/agg_color_gray.h rename to agg/agg_color_gray.h diff --git a/agg-2.4/agg_color_rgba.h b/agg/agg_color_rgba.h similarity index 100% rename from agg-2.4/agg_color_rgba.h rename to agg/agg_color_rgba.h diff --git a/agg-2.4/agg_config.h b/agg/agg_config.h similarity index 100% rename from agg-2.4/agg_config.h rename to agg/agg_config.h diff --git a/agg-2.4/agg_conv_adaptor_vcgen.h b/agg/agg_conv_adaptor_vcgen.h similarity index 100% rename from agg-2.4/agg_conv_adaptor_vcgen.h rename to agg/agg_conv_adaptor_vcgen.h diff --git a/agg-2.4/agg_conv_adaptor_vpgen.h b/agg/agg_conv_adaptor_vpgen.h similarity index 100% rename from agg-2.4/agg_conv_adaptor_vpgen.h rename to agg/agg_conv_adaptor_vpgen.h diff --git a/agg-2.4/agg_conv_bspline.h b/agg/agg_conv_bspline.h similarity index 100% rename from agg-2.4/agg_conv_bspline.h rename to agg/agg_conv_bspline.h diff --git a/agg-2.4/agg_conv_clip_polygon.h b/agg/agg_conv_clip_polygon.h similarity index 100% rename from agg-2.4/agg_conv_clip_polygon.h rename to agg/agg_conv_clip_polygon.h diff --git a/agg-2.4/agg_conv_clip_polyline.h b/agg/agg_conv_clip_polyline.h similarity index 100% rename from agg-2.4/agg_conv_clip_polyline.h rename to agg/agg_conv_clip_polyline.h diff --git a/agg-2.4/agg_conv_close_polygon.h b/agg/agg_conv_close_polygon.h similarity index 100% rename from agg-2.4/agg_conv_close_polygon.h rename to agg/agg_conv_close_polygon.h diff --git a/agg-2.4/agg_conv_concat.h b/agg/agg_conv_concat.h similarity index 100% rename from agg-2.4/agg_conv_concat.h rename to agg/agg_conv_concat.h diff --git a/agg-2.4/agg_conv_contour.h b/agg/agg_conv_contour.h similarity index 100% rename from agg-2.4/agg_conv_contour.h rename to agg/agg_conv_contour.h diff --git a/agg-2.4/agg_conv_curve.h b/agg/agg_conv_curve.h similarity index 100% rename from agg-2.4/agg_conv_curve.h rename to agg/agg_conv_curve.h diff --git a/agg-2.4/agg_conv_dash.h b/agg/agg_conv_dash.h similarity index 100% rename from agg-2.4/agg_conv_dash.h rename to agg/agg_conv_dash.h diff --git a/agg-2.4/agg_conv_gpc.h b/agg/agg_conv_gpc.h similarity index 100% rename from agg-2.4/agg_conv_gpc.h rename to agg/agg_conv_gpc.h diff --git a/agg-2.4/agg_conv_marker.h b/agg/agg_conv_marker.h similarity index 100% rename from agg-2.4/agg_conv_marker.h rename to agg/agg_conv_marker.h diff --git a/agg-2.4/agg_conv_marker_adaptor.h b/agg/agg_conv_marker_adaptor.h similarity index 100% rename from agg-2.4/agg_conv_marker_adaptor.h rename to agg/agg_conv_marker_adaptor.h diff --git a/agg-2.4/agg_conv_segmentator.h b/agg/agg_conv_segmentator.h similarity index 100% rename from agg-2.4/agg_conv_segmentator.h rename to agg/agg_conv_segmentator.h diff --git a/agg-2.4/agg_conv_shorten_path.h b/agg/agg_conv_shorten_path.h similarity index 100% rename from agg-2.4/agg_conv_shorten_path.h rename to agg/agg_conv_shorten_path.h diff --git a/agg-2.4/agg_conv_smooth_poly1.h b/agg/agg_conv_smooth_poly1.h similarity index 100% rename from agg-2.4/agg_conv_smooth_poly1.h rename to agg/agg_conv_smooth_poly1.h diff --git a/agg-2.4/agg_conv_stroke.h b/agg/agg_conv_stroke.h similarity index 100% rename from agg-2.4/agg_conv_stroke.h rename to agg/agg_conv_stroke.h diff --git a/agg-2.4/agg_conv_transform.h b/agg/agg_conv_transform.h similarity index 100% rename from agg-2.4/agg_conv_transform.h rename to agg/agg_conv_transform.h diff --git a/agg-2.4/agg_conv_unclose_polygon.h b/agg/agg_conv_unclose_polygon.h similarity index 100% rename from agg-2.4/agg_conv_unclose_polygon.h rename to agg/agg_conv_unclose_polygon.h diff --git a/agg-2.4/agg_curves.cpp b/agg/agg_curves.cpp similarity index 100% rename from agg-2.4/agg_curves.cpp rename to agg/agg_curves.cpp diff --git a/agg-2.4/agg_curves.h b/agg/agg_curves.h similarity index 100% rename from agg-2.4/agg_curves.h rename to agg/agg_curves.h diff --git a/agg-2.4/agg_dda_line.h b/agg/agg_dda_line.h similarity index 100% rename from agg-2.4/agg_dda_line.h rename to agg/agg_dda_line.h diff --git a/agg-2.4/agg_ellipse.h b/agg/agg_ellipse.h similarity index 100% rename from agg-2.4/agg_ellipse.h rename to agg/agg_ellipse.h diff --git a/agg-2.4/agg_ellipse_bresenham.h b/agg/agg_ellipse_bresenham.h similarity index 100% rename from agg-2.4/agg_ellipse_bresenham.h rename to agg/agg_ellipse_bresenham.h diff --git a/agg-2.4/agg_embedded_raster_fonts.cpp b/agg/agg_embedded_raster_fonts.cpp similarity index 100% rename from agg-2.4/agg_embedded_raster_fonts.cpp rename to agg/agg_embedded_raster_fonts.cpp diff --git a/agg-2.4/agg_embedded_raster_fonts.h b/agg/agg_embedded_raster_fonts.h similarity index 100% rename from agg-2.4/agg_embedded_raster_fonts.h rename to agg/agg_embedded_raster_fonts.h diff --git a/agg-2.4/agg_font_cache_manager.h b/agg/agg_font_cache_manager.h similarity index 100% rename from agg-2.4/agg_font_cache_manager.h rename to agg/agg_font_cache_manager.h diff --git a/agg-2.4/agg_font_freetype.cpp b/agg/agg_font_freetype.cpp similarity index 100% rename from agg-2.4/agg_font_freetype.cpp rename to agg/agg_font_freetype.cpp diff --git a/agg-2.4/agg_font_freetype.h b/agg/agg_font_freetype.h similarity index 100% rename from agg-2.4/agg_font_freetype.h rename to agg/agg_font_freetype.h diff --git a/agg-2.4/agg_gamma_functions.h b/agg/agg_gamma_functions.h similarity index 100% rename from agg-2.4/agg_gamma_functions.h rename to agg/agg_gamma_functions.h diff --git a/agg-2.4/agg_gamma_lut.h b/agg/agg_gamma_lut.h similarity index 100% rename from agg-2.4/agg_gamma_lut.h rename to agg/agg_gamma_lut.h diff --git a/agg-2.4/agg_glyph_raster_bin.h b/agg/agg_glyph_raster_bin.h similarity index 100% rename from agg-2.4/agg_glyph_raster_bin.h rename to agg/agg_glyph_raster_bin.h diff --git a/agg-2.4/agg_gradient_lut.h b/agg/agg_gradient_lut.h similarity index 100% rename from agg-2.4/agg_gradient_lut.h rename to agg/agg_gradient_lut.h diff --git a/agg-2.4/agg_gsv_text.cpp b/agg/agg_gsv_text.cpp similarity index 100% rename from agg-2.4/agg_gsv_text.cpp rename to agg/agg_gsv_text.cpp diff --git a/agg-2.4/agg_gsv_text.h b/agg/agg_gsv_text.h similarity index 100% rename from agg-2.4/agg_gsv_text.h rename to agg/agg_gsv_text.h diff --git a/agg-2.4/agg_image_accessors.h b/agg/agg_image_accessors.h similarity index 100% rename from agg-2.4/agg_image_accessors.h rename to agg/agg_image_accessors.h diff --git a/agg-2.4/agg_image_filters.cpp b/agg/agg_image_filters.cpp similarity index 100% rename from agg-2.4/agg_image_filters.cpp rename to agg/agg_image_filters.cpp diff --git a/agg-2.4/agg_image_filters.h b/agg/agg_image_filters.h similarity index 100% rename from agg-2.4/agg_image_filters.h rename to agg/agg_image_filters.h diff --git a/agg-2.4/agg_line_aa_basics.cpp b/agg/agg_line_aa_basics.cpp similarity index 100% rename from agg-2.4/agg_line_aa_basics.cpp rename to agg/agg_line_aa_basics.cpp diff --git a/agg-2.4/agg_line_aa_basics.h b/agg/agg_line_aa_basics.h similarity index 100% rename from agg-2.4/agg_line_aa_basics.h rename to agg/agg_line_aa_basics.h diff --git a/agg-2.4/agg_line_profile_aa.cpp b/agg/agg_line_profile_aa.cpp similarity index 100% rename from agg-2.4/agg_line_profile_aa.cpp rename to agg/agg_line_profile_aa.cpp diff --git a/agg-2.4/agg_math.h b/agg/agg_math.h similarity index 100% rename from agg-2.4/agg_math.h rename to agg/agg_math.h diff --git a/agg-2.4/agg_math_stroke.h b/agg/agg_math_stroke.h similarity index 100% rename from agg-2.4/agg_math_stroke.h rename to agg/agg_math_stroke.h diff --git a/agg-2.4/agg_path_length.h b/agg/agg_path_length.h similarity index 100% rename from agg-2.4/agg_path_length.h rename to agg/agg_path_length.h diff --git a/agg-2.4/agg_path_storage.h b/agg/agg_path_storage.h similarity index 100% rename from agg-2.4/agg_path_storage.h rename to agg/agg_path_storage.h diff --git a/agg-2.4/agg_path_storage_integer.h b/agg/agg_path_storage_integer.h similarity index 100% rename from agg-2.4/agg_path_storage_integer.h rename to agg/agg_path_storage_integer.h diff --git a/agg-2.4/agg_pattern_filters_rgba.h b/agg/agg_pattern_filters_rgba.h similarity index 100% rename from agg-2.4/agg_pattern_filters_rgba.h rename to agg/agg_pattern_filters_rgba.h diff --git a/agg-2.4/agg_pixfmt_amask_adaptor.h b/agg/agg_pixfmt_amask_adaptor.h similarity index 100% rename from agg-2.4/agg_pixfmt_amask_adaptor.h rename to agg/agg_pixfmt_amask_adaptor.h diff --git a/agg-2.4/agg_pixfmt_gray.h b/agg/agg_pixfmt_gray.h similarity index 100% rename from agg-2.4/agg_pixfmt_gray.h rename to agg/agg_pixfmt_gray.h diff --git a/agg-2.4/agg_pixfmt_rgb.h b/agg/agg_pixfmt_rgb.h similarity index 100% rename from agg-2.4/agg_pixfmt_rgb.h rename to agg/agg_pixfmt_rgb.h diff --git a/agg-2.4/agg_pixfmt_rgb_packed.h b/agg/agg_pixfmt_rgb_packed.h similarity index 100% rename from agg-2.4/agg_pixfmt_rgb_packed.h rename to agg/agg_pixfmt_rgb_packed.h diff --git a/agg-2.4/agg_pixfmt_rgba.h b/agg/agg_pixfmt_rgba.h similarity index 100% rename from agg-2.4/agg_pixfmt_rgba.h rename to agg/agg_pixfmt_rgba.h diff --git a/agg-2.4/agg_pixfmt_transposer.h b/agg/agg_pixfmt_transposer.h similarity index 100% rename from agg-2.4/agg_pixfmt_transposer.h rename to agg/agg_pixfmt_transposer.h diff --git a/agg-2.4/agg_rasterizer_cells_aa.h b/agg/agg_rasterizer_cells_aa.h similarity index 100% rename from agg-2.4/agg_rasterizer_cells_aa.h rename to agg/agg_rasterizer_cells_aa.h diff --git a/agg-2.4/agg_rasterizer_compound_aa.h b/agg/agg_rasterizer_compound_aa.h similarity index 100% rename from agg-2.4/agg_rasterizer_compound_aa.h rename to agg/agg_rasterizer_compound_aa.h diff --git a/agg-2.4/agg_rasterizer_outline.h b/agg/agg_rasterizer_outline.h similarity index 100% rename from agg-2.4/agg_rasterizer_outline.h rename to agg/agg_rasterizer_outline.h diff --git a/agg-2.4/agg_rasterizer_outline_aa.h b/agg/agg_rasterizer_outline_aa.h similarity index 100% rename from agg-2.4/agg_rasterizer_outline_aa.h rename to agg/agg_rasterizer_outline_aa.h diff --git a/agg-2.4/agg_rasterizer_scanline_aa.h b/agg/agg_rasterizer_scanline_aa.h similarity index 100% rename from agg-2.4/agg_rasterizer_scanline_aa.h rename to agg/agg_rasterizer_scanline_aa.h diff --git a/agg-2.4/agg_rasterizer_sl_clip.h b/agg/agg_rasterizer_sl_clip.h similarity index 100% rename from agg-2.4/agg_rasterizer_sl_clip.h rename to agg/agg_rasterizer_sl_clip.h diff --git a/agg-2.4/agg_renderer_base.h b/agg/agg_renderer_base.h similarity index 100% rename from agg-2.4/agg_renderer_base.h rename to agg/agg_renderer_base.h diff --git a/agg-2.4/agg_renderer_markers.h b/agg/agg_renderer_markers.h similarity index 100% rename from agg-2.4/agg_renderer_markers.h rename to agg/agg_renderer_markers.h diff --git a/agg-2.4/agg_renderer_mclip.h b/agg/agg_renderer_mclip.h similarity index 100% rename from agg-2.4/agg_renderer_mclip.h rename to agg/agg_renderer_mclip.h diff --git a/agg-2.4/agg_renderer_outline_aa.h b/agg/agg_renderer_outline_aa.h similarity index 100% rename from agg-2.4/agg_renderer_outline_aa.h rename to agg/agg_renderer_outline_aa.h diff --git a/agg-2.4/agg_renderer_outline_image.h b/agg/agg_renderer_outline_image.h similarity index 100% rename from agg-2.4/agg_renderer_outline_image.h rename to agg/agg_renderer_outline_image.h diff --git a/agg-2.4/agg_renderer_primitives.h b/agg/agg_renderer_primitives.h similarity index 100% rename from agg-2.4/agg_renderer_primitives.h rename to agg/agg_renderer_primitives.h diff --git a/agg-2.4/agg_renderer_raster_text.h b/agg/agg_renderer_raster_text.h similarity index 100% rename from agg-2.4/agg_renderer_raster_text.h rename to agg/agg_renderer_raster_text.h diff --git a/agg-2.4/agg_renderer_scanline.h b/agg/agg_renderer_scanline.h similarity index 100% rename from agg-2.4/agg_renderer_scanline.h rename to agg/agg_renderer_scanline.h diff --git a/agg-2.4/agg_rendering_buffer.h b/agg/agg_rendering_buffer.h similarity index 100% rename from agg-2.4/agg_rendering_buffer.h rename to agg/agg_rendering_buffer.h diff --git a/agg-2.4/agg_rendering_buffer_dynarow.h b/agg/agg_rendering_buffer_dynarow.h similarity index 100% rename from agg-2.4/agg_rendering_buffer_dynarow.h rename to agg/agg_rendering_buffer_dynarow.h diff --git a/agg-2.4/agg_rounded_rect.cpp b/agg/agg_rounded_rect.cpp similarity index 100% rename from agg-2.4/agg_rounded_rect.cpp rename to agg/agg_rounded_rect.cpp diff --git a/agg-2.4/agg_rounded_rect.h b/agg/agg_rounded_rect.h similarity index 100% rename from agg-2.4/agg_rounded_rect.h rename to agg/agg_rounded_rect.h diff --git a/agg-2.4/agg_scanline_bin.h b/agg/agg_scanline_bin.h similarity index 100% rename from agg-2.4/agg_scanline_bin.h rename to agg/agg_scanline_bin.h diff --git a/agg-2.4/agg_scanline_boolean_algebra.h b/agg/agg_scanline_boolean_algebra.h similarity index 100% rename from agg-2.4/agg_scanline_boolean_algebra.h rename to agg/agg_scanline_boolean_algebra.h diff --git a/agg-2.4/agg_scanline_p.h b/agg/agg_scanline_p.h similarity index 100% rename from agg-2.4/agg_scanline_p.h rename to agg/agg_scanline_p.h diff --git a/agg-2.4/agg_scanline_storage_aa.h b/agg/agg_scanline_storage_aa.h similarity index 100% rename from agg-2.4/agg_scanline_storage_aa.h rename to agg/agg_scanline_storage_aa.h diff --git a/agg-2.4/agg_scanline_storage_bin.h b/agg/agg_scanline_storage_bin.h similarity index 100% rename from agg-2.4/agg_scanline_storage_bin.h rename to agg/agg_scanline_storage_bin.h diff --git a/agg-2.4/agg_scanline_u.h b/agg/agg_scanline_u.h similarity index 100% rename from agg-2.4/agg_scanline_u.h rename to agg/agg_scanline_u.h diff --git a/agg-2.4/agg_shorten_path.h b/agg/agg_shorten_path.h similarity index 100% rename from agg-2.4/agg_shorten_path.h rename to agg/agg_shorten_path.h diff --git a/agg-2.4/agg_simul_eq.h b/agg/agg_simul_eq.h similarity index 100% rename from agg-2.4/agg_simul_eq.h rename to agg/agg_simul_eq.h diff --git a/agg-2.4/agg_span_allocator.h b/agg/agg_span_allocator.h similarity index 100% rename from agg-2.4/agg_span_allocator.h rename to agg/agg_span_allocator.h diff --git a/agg-2.4/agg_span_converter.h b/agg/agg_span_converter.h similarity index 100% rename from agg-2.4/agg_span_converter.h rename to agg/agg_span_converter.h diff --git a/agg-2.4/agg_span_gouraud.h b/agg/agg_span_gouraud.h similarity index 100% rename from agg-2.4/agg_span_gouraud.h rename to agg/agg_span_gouraud.h diff --git a/agg-2.4/agg_span_gouraud_gray.h b/agg/agg_span_gouraud_gray.h similarity index 100% rename from agg-2.4/agg_span_gouraud_gray.h rename to agg/agg_span_gouraud_gray.h diff --git a/agg-2.4/agg_span_gouraud_rgba.h b/agg/agg_span_gouraud_rgba.h similarity index 100% rename from agg-2.4/agg_span_gouraud_rgba.h rename to agg/agg_span_gouraud_rgba.h diff --git a/agg-2.4/agg_span_gradient.h b/agg/agg_span_gradient.h similarity index 100% rename from agg-2.4/agg_span_gradient.h rename to agg/agg_span_gradient.h diff --git a/agg-2.4/agg_span_gradient_alpha.h b/agg/agg_span_gradient_alpha.h similarity index 100% rename from agg-2.4/agg_span_gradient_alpha.h rename to agg/agg_span_gradient_alpha.h diff --git a/agg-2.4/agg_span_image_filter.h b/agg/agg_span_image_filter.h similarity index 100% rename from agg-2.4/agg_span_image_filter.h rename to agg/agg_span_image_filter.h diff --git a/agg-2.4/agg_span_image_filter_gray.h b/agg/agg_span_image_filter_gray.h similarity index 100% rename from agg-2.4/agg_span_image_filter_gray.h rename to agg/agg_span_image_filter_gray.h diff --git a/agg-2.4/agg_span_image_filter_rgb.h b/agg/agg_span_image_filter_rgb.h similarity index 100% rename from agg-2.4/agg_span_image_filter_rgb.h rename to agg/agg_span_image_filter_rgb.h diff --git a/agg-2.4/agg_span_image_filter_rgba.h b/agg/agg_span_image_filter_rgba.h similarity index 100% rename from agg-2.4/agg_span_image_filter_rgba.h rename to agg/agg_span_image_filter_rgba.h diff --git a/agg-2.4/agg_span_interpolator_adaptor.h b/agg/agg_span_interpolator_adaptor.h similarity index 100% rename from agg-2.4/agg_span_interpolator_adaptor.h rename to agg/agg_span_interpolator_adaptor.h diff --git a/agg-2.4/agg_span_interpolator_linear.h b/agg/agg_span_interpolator_linear.h similarity index 100% rename from agg-2.4/agg_span_interpolator_linear.h rename to agg/agg_span_interpolator_linear.h diff --git a/agg-2.4/agg_span_interpolator_persp.h b/agg/agg_span_interpolator_persp.h similarity index 100% rename from agg-2.4/agg_span_interpolator_persp.h rename to agg/agg_span_interpolator_persp.h diff --git a/agg-2.4/agg_span_interpolator_trans.h b/agg/agg_span_interpolator_trans.h similarity index 100% rename from agg-2.4/agg_span_interpolator_trans.h rename to agg/agg_span_interpolator_trans.h diff --git a/agg-2.4/agg_span_pattern_gray.h b/agg/agg_span_pattern_gray.h similarity index 100% rename from agg-2.4/agg_span_pattern_gray.h rename to agg/agg_span_pattern_gray.h diff --git a/agg-2.4/agg_span_pattern_rgb.h b/agg/agg_span_pattern_rgb.h similarity index 100% rename from agg-2.4/agg_span_pattern_rgb.h rename to agg/agg_span_pattern_rgb.h diff --git a/agg-2.4/agg_span_pattern_rgba.h b/agg/agg_span_pattern_rgba.h similarity index 100% rename from agg-2.4/agg_span_pattern_rgba.h rename to agg/agg_span_pattern_rgba.h diff --git a/agg-2.4/agg_span_solid.h b/agg/agg_span_solid.h similarity index 100% rename from agg-2.4/agg_span_solid.h rename to agg/agg_span_solid.h diff --git a/agg-2.4/agg_span_subdiv_adaptor.h b/agg/agg_span_subdiv_adaptor.h similarity index 100% rename from agg-2.4/agg_span_subdiv_adaptor.h rename to agg/agg_span_subdiv_adaptor.h diff --git a/agg-2.4/agg_sqrt_tables.cpp b/agg/agg_sqrt_tables.cpp similarity index 100% rename from agg-2.4/agg_sqrt_tables.cpp rename to agg/agg_sqrt_tables.cpp diff --git a/agg-2.4/agg_trans_affine.cpp b/agg/agg_trans_affine.cpp similarity index 100% rename from agg-2.4/agg_trans_affine.cpp rename to agg/agg_trans_affine.cpp diff --git a/agg-2.4/agg_trans_affine.h b/agg/agg_trans_affine.h similarity index 100% rename from agg-2.4/agg_trans_affine.h rename to agg/agg_trans_affine.h diff --git a/agg-2.4/agg_trans_bilinear.h b/agg/agg_trans_bilinear.h similarity index 100% rename from agg-2.4/agg_trans_bilinear.h rename to agg/agg_trans_bilinear.h diff --git a/agg-2.4/agg_trans_double_path.cpp b/agg/agg_trans_double_path.cpp similarity index 100% rename from agg-2.4/agg_trans_double_path.cpp rename to agg/agg_trans_double_path.cpp diff --git a/agg-2.4/agg_trans_double_path.h b/agg/agg_trans_double_path.h similarity index 100% rename from agg-2.4/agg_trans_double_path.h rename to agg/agg_trans_double_path.h diff --git a/agg-2.4/agg_trans_perspective.h b/agg/agg_trans_perspective.h similarity index 100% rename from agg-2.4/agg_trans_perspective.h rename to agg/agg_trans_perspective.h diff --git a/agg-2.4/agg_trans_single_path.cpp b/agg/agg_trans_single_path.cpp similarity index 100% rename from agg-2.4/agg_trans_single_path.cpp rename to agg/agg_trans_single_path.cpp diff --git a/agg-2.4/agg_trans_single_path.h b/agg/agg_trans_single_path.h similarity index 100% rename from agg-2.4/agg_trans_single_path.h rename to agg/agg_trans_single_path.h diff --git a/agg-2.4/agg_trans_viewport.h b/agg/agg_trans_viewport.h similarity index 100% rename from agg-2.4/agg_trans_viewport.h rename to agg/agg_trans_viewport.h diff --git a/agg-2.4/agg_trans_warp_magnifier.cpp b/agg/agg_trans_warp_magnifier.cpp similarity index 100% rename from agg-2.4/agg_trans_warp_magnifier.cpp rename to agg/agg_trans_warp_magnifier.cpp diff --git a/agg-2.4/agg_trans_warp_magnifier.h b/agg/agg_trans_warp_magnifier.h similarity index 100% rename from agg-2.4/agg_trans_warp_magnifier.h rename to agg/agg_trans_warp_magnifier.h diff --git a/agg-2.4/agg_vcgen_bspline.cpp b/agg/agg_vcgen_bspline.cpp similarity index 100% rename from agg-2.4/agg_vcgen_bspline.cpp rename to agg/agg_vcgen_bspline.cpp diff --git a/agg-2.4/agg_vcgen_bspline.h b/agg/agg_vcgen_bspline.h similarity index 100% rename from agg-2.4/agg_vcgen_bspline.h rename to agg/agg_vcgen_bspline.h diff --git a/agg-2.4/agg_vcgen_contour.cpp b/agg/agg_vcgen_contour.cpp similarity index 100% rename from agg-2.4/agg_vcgen_contour.cpp rename to agg/agg_vcgen_contour.cpp diff --git a/agg-2.4/agg_vcgen_contour.h b/agg/agg_vcgen_contour.h similarity index 100% rename from agg-2.4/agg_vcgen_contour.h rename to agg/agg_vcgen_contour.h diff --git a/agg-2.4/agg_vcgen_dash.cpp b/agg/agg_vcgen_dash.cpp similarity index 100% rename from agg-2.4/agg_vcgen_dash.cpp rename to agg/agg_vcgen_dash.cpp diff --git a/agg-2.4/agg_vcgen_dash.h b/agg/agg_vcgen_dash.h similarity index 100% rename from agg-2.4/agg_vcgen_dash.h rename to agg/agg_vcgen_dash.h diff --git a/agg-2.4/agg_vcgen_markers_term.cpp b/agg/agg_vcgen_markers_term.cpp similarity index 100% rename from agg-2.4/agg_vcgen_markers_term.cpp rename to agg/agg_vcgen_markers_term.cpp diff --git a/agg-2.4/agg_vcgen_markers_term.h b/agg/agg_vcgen_markers_term.h similarity index 100% rename from agg-2.4/agg_vcgen_markers_term.h rename to agg/agg_vcgen_markers_term.h diff --git a/agg-2.4/agg_vcgen_smooth_poly1.cpp b/agg/agg_vcgen_smooth_poly1.cpp similarity index 100% rename from agg-2.4/agg_vcgen_smooth_poly1.cpp rename to agg/agg_vcgen_smooth_poly1.cpp diff --git a/agg-2.4/agg_vcgen_smooth_poly1.h b/agg/agg_vcgen_smooth_poly1.h similarity index 100% rename from agg-2.4/agg_vcgen_smooth_poly1.h rename to agg/agg_vcgen_smooth_poly1.h diff --git a/agg-2.4/agg_vcgen_stroke.cpp b/agg/agg_vcgen_stroke.cpp similarity index 100% rename from agg-2.4/agg_vcgen_stroke.cpp rename to agg/agg_vcgen_stroke.cpp diff --git a/agg-2.4/agg_vcgen_stroke.h b/agg/agg_vcgen_stroke.h similarity index 100% rename from agg-2.4/agg_vcgen_stroke.h rename to agg/agg_vcgen_stroke.h diff --git a/agg-2.4/agg_vcgen_vertex_sequence.h b/agg/agg_vcgen_vertex_sequence.h similarity index 100% rename from agg-2.4/agg_vcgen_vertex_sequence.h rename to agg/agg_vcgen_vertex_sequence.h diff --git a/agg-2.4/agg_vertex_sequence.h b/agg/agg_vertex_sequence.h similarity index 100% rename from agg-2.4/agg_vertex_sequence.h rename to agg/agg_vertex_sequence.h diff --git a/agg-2.4/agg_vpgen_clip_polygon.cpp b/agg/agg_vpgen_clip_polygon.cpp similarity index 100% rename from agg-2.4/agg_vpgen_clip_polygon.cpp rename to agg/agg_vpgen_clip_polygon.cpp diff --git a/agg-2.4/agg_vpgen_clip_polygon.h b/agg/agg_vpgen_clip_polygon.h similarity index 100% rename from agg-2.4/agg_vpgen_clip_polygon.h rename to agg/agg_vpgen_clip_polygon.h diff --git a/agg-2.4/agg_vpgen_clip_polyline.cpp b/agg/agg_vpgen_clip_polyline.cpp similarity index 100% rename from agg-2.4/agg_vpgen_clip_polyline.cpp rename to agg/agg_vpgen_clip_polyline.cpp diff --git a/agg-2.4/agg_vpgen_clip_polyline.h b/agg/agg_vpgen_clip_polyline.h similarity index 100% rename from agg-2.4/agg_vpgen_clip_polyline.h rename to agg/agg_vpgen_clip_polyline.h diff --git a/agg-2.4/agg_vpgen_segmentator.cpp b/agg/agg_vpgen_segmentator.cpp similarity index 100% rename from agg-2.4/agg_vpgen_segmentator.cpp rename to agg/agg_vpgen_segmentator.cpp diff --git a/agg-2.4/agg_vpgen_segmentator.h b/agg/agg_vpgen_segmentator.h similarity index 100% rename from agg-2.4/agg_vpgen_segmentator.h rename to agg/agg_vpgen_segmentator.h diff --git a/agg-2.4/util/agg_color_conv.h b/agg/util/agg_color_conv.h similarity index 100% rename from agg-2.4/util/agg_color_conv.h rename to agg/util/agg_color_conv.h diff --git a/agg-2.4/util/agg_color_conv_rgb16.h b/agg/util/agg_color_conv_rgb16.h similarity index 100% rename from agg-2.4/util/agg_color_conv_rgb16.h rename to agg/util/agg_color_conv_rgb16.h diff --git a/agg-2.4/util/agg_color_conv_rgb8.h b/agg/util/agg_color_conv_rgb8.h similarity index 100% rename from agg-2.4/util/agg_color_conv_rgb8.h rename to agg/util/agg_color_conv_rgb8.h diff --git a/file.mk b/file.mk index 6e61a57..f249014 100644 --- a/file.mk +++ b/file.mk @@ -1,30 +1,30 @@ -FILE_LIST = agg-2.4/agg_arc.cpp \ - agg-2.4/agg_arrowhead.cpp \ - agg-2.4/agg_bezier_arc.cpp \ - agg-2.4/agg_bspline.cpp \ - agg-2.4/agg_curves.cpp \ - agg-2.4/agg_embedded_raster_fonts.cpp \ - agg-2.4/agg_font_freetype.cpp \ - agg-2.4/agg_font_freetype.h \ - agg-2.4/agg_gsv_text.cpp \ - agg-2.4/agg_image_filters.cpp \ - agg-2.4/agg_line_aa_basics.cpp \ - agg-2.4/agg_line_profile_aa.cpp \ - agg-2.4/agg_rounded_rect.cpp \ - agg-2.4/agg_sqrt_tables.cpp \ - agg-2.4/agg_trans_affine.cpp \ - agg-2.4/agg_trans_double_path.cpp \ - agg-2.4/agg_trans_single_path.cpp \ - agg-2.4/agg_trans_warp_magnifier.cpp \ - agg-2.4/agg_vcgen_bspline.cpp \ - agg-2.4/agg_vcgen_contour.cpp \ - agg-2.4/agg_vcgen_dash.cpp \ - agg-2.4/agg_vcgen_markers_term.cpp \ - agg-2.4/agg_vcgen_smooth_poly1.cpp \ - agg-2.4/agg_vcgen_stroke.cpp \ - agg-2.4/agg_vpgen_clip_polygon.cpp \ - agg-2.4/agg_vpgen_clip_polyline.cpp \ - agg-2.4/agg_vpgen_segmentator.cpp +FILE_LIST = agg/agg_arc.cpp \ + agg/agg_arrowhead.cpp \ + agg/agg_bezier_arc.cpp \ + agg/agg_bspline.cpp \ + agg/agg_curves.cpp \ + agg/agg_embedded_raster_fonts.cpp \ + agg/agg_font_freetype.cpp \ + agg/agg_font_freetype.h \ + agg/agg_gsv_text.cpp \ + agg/agg_image_filters.cpp \ + agg/agg_line_aa_basics.cpp \ + agg/agg_line_profile_aa.cpp \ + agg/agg_rounded_rect.cpp \ + agg/agg_sqrt_tables.cpp \ + agg/agg_trans_affine.cpp \ + agg/agg_trans_double_path.cpp \ + agg/agg_trans_single_path.cpp \ + agg/agg_trans_warp_magnifier.cpp \ + agg/agg_vcgen_bspline.cpp \ + agg/agg_vcgen_contour.cpp \ + agg/agg_vcgen_dash.cpp \ + agg/agg_vcgen_markers_term.cpp \ + agg/agg_vcgen_smooth_poly1.cpp \ + agg/agg_vcgen_stroke.cpp \ + agg/agg_vpgen_clip_polygon.cpp \ + agg/agg_vpgen_clip_polyline.cpp \ + agg/agg_vpgen_segmentator.cpp