From b7d358b498800e4c240d381fa6f098af17a4d95b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 17 Jun 2015 10:01:00 -0700 Subject: Merge to XFA: Separate agg-authored code from fx-authored code. Original Review URL: https://codereview.chromium.org/1152743007. BUG=pdfium:166 R=brucedawson@chromium.org, thestig@chromium.org TBR=brucedawson@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/1186423003. --- pdfium.gyp | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'pdfium.gyp') diff --git a/pdfium.gyp b/pdfium.gyp index 241da48246..6585adfad2 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -617,7 +617,12 @@ { 'target_name': 'fxge', 'type': 'static_library', - 'ldflags': [ '-L<(PRODUCT_DIR)',], + 'ldflags': [ + '-L<(PRODUCT_DIR)', + ], + 'dependencies': [ + 'third_party/third_party.gyp:fx_agg', + ], 'sources': [ 'core/include/fxge/fpf.h', 'core/include/fxge/fx_dib.h', @@ -626,23 +631,8 @@ 'core/include/fxge/fx_ge.h', 'core/include/fxge/fx_ge_apple.h', 'core/include/fxge/fx_ge_win32.h', - 'core/src/fxge/agg/include/fxfx_agg_basics.h', - 'core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h', - 'core/src/fxge/agg/include/fxfx_agg_conv_dash.h', - 'core/src/fxge/agg/include/fxfx_agg_conv_stroke.h', - 'core/src/fxge/agg/include/fxfx_agg_curves.h', - 'core/src/fxge/agg/include/fxfx_agg_path_storage.h', - 'core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h', - 'core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h', - 'core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h', - 'core/src/fxge/agg/include/fxfx_agg_scanline_u.h', 'core/src/fxge/agg/include/fx_agg_driver.h', - 'core/src/fxge/agg/src/fxfx_agg_curves.cpp', - 'core/src/fxge/agg/src/fxfx_agg_driver.cpp', - 'core/src/fxge/agg/src/fxfx_agg_path_storage.cpp', - 'core/src/fxge/agg/src/fxfx_agg_rasterizer_scanline_aa.cpp', - 'core/src/fxge/agg/src/fxfx_agg_vcgen_dash.cpp', - 'core/src/fxge/agg/src/fxfx_agg_vcgen_stroke.cpp', + 'core/src/fxge/agg/src/fx_agg_driver.cpp', 'core/src/fxge/android/fpf_skiafont.cpp', 'core/src/fxge/android/fpf_skiafont.h', 'core/src/fxge/android/fpf_skiafontmgr.cpp', -- cgit v1.2.3