diff options
| -rw-r--r-- | gyp/pdf.gyp | 12 | ||||
| -rw-r--r-- | gyp/tests.gyp | 1 | ||||
| -rw-r--r-- | gyp/utils.gyp | 2 | ||||
| -rw-r--r-- | gyp/xps.gyp | 2 | ||||
| -rwxr-xr-x | src/utils/SkBitSet.cpp (renamed from src/pdf/SkBitSet.cpp) | 0 | ||||
| -rwxr-xr-x | src/utils/SkBitSet.h (renamed from include/pdf/SkBitSet.h) | 0 |
6 files changed, 11 insertions, 6 deletions
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp index 0d5fef5c4e..bb42f00d30 100644 --- a/gyp/pdf.gyp +++ b/gyp/pdf.gyp @@ -3,14 +3,20 @@ { 'target_name': 'pdf', 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + 'ports.gyp:ports', + 'utils.gyp:utils', + 'zlib.gyp:zlib', + ], 'include_dirs': [ '../include/config', '../include/core', '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h + '../src/utils', # needed to get SkBitSet.h ], 'sources': [ - '../include/pdf/SkBitSet.h', '../include/pdf/SkPDFCatalog.h', '../include/pdf/SkPDFDevice.h', '../include/pdf/SkPDFDocument.h', @@ -24,7 +30,6 @@ '../include/pdf/SkPDFTypes.h', '../include/pdf/SkPDFUtils.h', - '../src/pdf/SkBitSet.cpp', '../src/pdf/SkPDFCatalog.cpp', '../src/pdf/SkPDFDevice.cpp', '../src/pdf/SkPDFDocument.cpp', @@ -49,9 +54,6 @@ '../include/pdf', ], }, - 'dependencies': [ - 'zlib.gyp:zlib', - ], }, ], } diff --git a/gyp/tests.gyp b/gyp/tests.gyp index 249227463b..541db7f556 100644 --- a/gyp/tests.gyp +++ b/gyp/tests.gyp @@ -11,6 +11,7 @@ '../src/core', '../src/effects', '../src/gpu', + '../src/utils', ], 'sources': [ '../tests/AAClipTest.cpp', diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 1847e95842..e30b433f45 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -37,6 +37,8 @@ '../src/utils/SkBase64.cpp', '../src/utils/SkBase64.h', + '../src/utils/SkBitSet.cpp', + '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', '../src/utils/SkColorMatrix.cpp', diff --git a/gyp/xps.gyp b/gyp/xps.gyp index 80901660ac..5249c16790 100644 --- a/gyp/xps.gyp +++ b/gyp/xps.gyp @@ -7,12 +7,12 @@ 'core.gyp:core', 'images.gyp:images', 'utils.gyp:utils', - 'pdf.gyp:pdf', # needed to get SkBitSet ], 'include_dirs': [ '../include/device/xps', '../include/utils/win', '../src/core', # needed to get SkGlyphCache.h + '../src/utils', # needed to get SkBitSet.h ], 'sources': [ '../include/device/xps/SkConstexprMath.h', diff --git a/src/pdf/SkBitSet.cpp b/src/utils/SkBitSet.cpp index 664c8cd86f..664c8cd86f 100755 --- a/src/pdf/SkBitSet.cpp +++ b/src/utils/SkBitSet.cpp diff --git a/include/pdf/SkBitSet.h b/src/utils/SkBitSet.h index 484fc2aec2..484fc2aec2 100755 --- a/include/pdf/SkBitSet.h +++ b/src/utils/SkBitSet.h |