Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # GYP file to build the "gm" (golden master) executable. | 1 # GYP file to build the "gm" (golden master) executable. |
| 2 { | 2 { |
| 3 'includes': [ | 3 'includes': [ |
| 4 'apptype_console.gypi', | 4 'apptype_console.gypi', |
| 5 ], | 5 ], |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'gm_expectations', | 8 'target_name': 'gm_expectations', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'include_dirs' : [ | 10 'include_dirs' : [ |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 'defines': [ | 66 'defines': [ |
| 67 'SK_BUILD_NATIVE_PDF_RENDERER', | 67 'SK_BUILD_NATIVE_PDF_RENDERER', |
| 68 ], | 68 ], |
| 69 'include_dirs' : [ | 69 'include_dirs' : [ |
| 70 '../experimental/PdfViewer/inc', | 70 '../experimental/PdfViewer/inc', |
| 71 ], | 71 ], |
| 72 'dependencies': [ | 72 'dependencies': [ |
| 73 'pdfviewer_lib.gyp:pdfviewer_lib', | 73 'pdfviewer_lib.gyp:pdfviewer_lib', |
| 74 ], | 74 ], |
| 75 }], | 75 }], |
| 76 ['skia_os in ["linux", "mac", "win"]', { | 76 ['skia_os in ["linux", "win"] or (skia_os == "mac" and skia_mac_poppler) ', { |
|
epoger
2014/01/08 19:40:22
I think it would be clearer to use a single flag (
vandebo (ex-Chrome)
2014/01/08 21:24:15
Changed to skia_enable_popper and made that work a
epoger
2014/01/08 21:38:12
Why do we still need the list of operating systems
vandebo (ex-Chrome)
2014/01/08 22:08:18
Done.
| |
| 77 'dependencies': [ | 77 'dependencies': [ |
| 78 'poppler.gyp:libpoppler-cpp-gpl', | 78 'poppler.gyp:libpoppler-cpp-gpl', |
| 79 ], | 79 ], |
| 80 'sources': [ | 80 'sources': [ |
| 81 '../src/utils/SkPDFRasterizer.cpp', | 81 '../src/utils/SkPDFRasterizer.cpp', |
| 82 ], | 82 ], |
| 83 'defines': [ | 83 'defines': [ |
| 84 'SK_BUILD_POPPLER', | 84 'SK_BUILD_POPPLER', |
| 85 ], | 85 ], |
| 86 }], | 86 }], |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 108 '../src/gpu', | 108 '../src/gpu', |
| 109 ], | 109 ], |
| 110 'dependencies': [ | 110 'dependencies': [ |
| 111 'gputest.gyp:skgputest', | 111 'gputest.gyp:skgputest', |
| 112 ], | 112 ], |
| 113 }], | 113 }], |
| 114 ], | 114 ], |
| 115 }, | 115 }, |
| 116 ], | 116 ], |
| 117 } | 117 } |
| OLD | NEW |