Index: samples/samples.gyp |
diff --git a/samples/samples.gyp b/samples/samples.gyp |
index 0044c5c030ab51c996ba32ff4ac2a8c1a59d70ab..97181ba208cb863597b3d929899b17f855a9d95d 100644 |
--- a/samples/samples.gyp |
+++ b/samples/samples.gyp |
@@ -7,18 +7,15 @@ |
'pdf_enable_v8%': 1, |
}, |
'target_defaults': { |
- 'type': 'executable', |
- 'dependencies': [ |
- '../pdfium.gyp:pdfium', |
- ], |
- 'include_dirs': [ |
- '<(DEPTH)', |
- ], |
'defines' : [ |
'PNG_PREFIX', |
'PNGPREFIX_H', |
'PNG_USE_READ_MACROS', |
], |
+ 'include_dirs': [ |
+ # This is implicit in GN. |
+ '<(DEPTH)', |
+ ], |
'conditions': [ |
['pdf_enable_v8==1', { |
'defines': [ |
@@ -38,11 +35,20 @@ |
'dependencies': [ |
'../pdfium.gyp:pdfium', |
'../pdfium.gyp:test_support', |
+ # Regardless of whether the library ships against system freetype, |
+ # always link this binary against the bundled one for consistency |
+ # of results across platforms. |
+ '../third_party/third_party.gyp:fx_freetype', |
], |
'sources': [ |
'pdfium_test.cc', |
'image_diff_png.cc', |
], |
+ 'link_settings': { |
+ 'libraries!': [ |
+ '-lfreetype', |
+ ], |
+ }, |
'conditions': [ |
['pdf_enable_v8==1', { |
'dependencies': [ |
@@ -56,12 +62,9 @@ |
'type': 'executable', |
'variables': { 'enable_wexit_time_destructors': 1, }, |
'dependencies': [ |
- '../pdfium.gyp:fxcodec', |
+ '../pdfium.gyp:pdfium', |
'../third_party/third_party.gyp:pdfium_base', |
], |
- 'include_dirs': [ |
- '../../', |
- ], |
'sources': [ |
'image_diff.cc', |
'image_diff_png.h', |