diff options
| author |  Ben Wagner <bungeman@google.com> | 2016-10-24 14:11:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-24 19:26:22 +0000 |
| commit | d0a3b06ce2155b5455c8827415e4505c328b9003 (patch) | |
| tree | ba430775dc602d2ded7dbb78c70c4b8473fd3cd7 | |
| parent | 85d301745a9031b13f1b716f07e1041f2fdd1ce3 (diff) | |
Add gif sources to public.bzl.
This also removes SK_HAS_GIF_LIBRARY since it does not appear in the
code.
Change-Id: I6e4d6ed560eb2877e6db61edf15f6be832166b44
Reviewed-on: https://skia-review.googlesource.com/3752
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
| -rw-r--r-- | cmake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 1 | ||||
| -rw-r--r-- | public.bzl | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 90e7e92700..0bddf83f7c 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -184,7 +184,6 @@ endif() if (GIF_FOUND) list (APPEND private_includes ${GIF_INCLUDE_DIRS}) list (APPEND libs ${GIF_LIBRARIES}) - add_definitions(-DSK_HAS_GIF_LIBRARY) else() remove_srcs(../src/images/*GIF*) endif() diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index e1e657a981..62dba4b722 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -15,7 +15,6 @@ # are missing some of the required decoding libraries may choose # not to define these. This will disable some decoder and encoder # features. - 'SK_HAS_GIF_LIBRARY', 'SK_HAS_JPEG_LIBRARY', 'SK_HAS_PNG_LIBRARY', 'SK_HAS_WEBP_LIBRARY', diff --git a/public.bzl b/public.bzl index b27336be1a..8636d2903d 100644 --- a/public.bzl +++ b/public.bzl @@ -84,6 +84,8 @@ BASE_SRCS_ALL = struct( # Third Party "third_party/etc1/*.cpp", "third_party/etc1/*.h", + "third_party/gif/*.cpp", + "third_party/gif/*.h", "third_party/ktx/*.cpp", "third_party/ktx/*.h", ], @@ -385,6 +387,7 @@ INCLUDES = [ "src/sksl", "src/utils", "third_party/etc1", + "third_party/gif", "third_party/ktx", ] @@ -570,7 +573,6 @@ DEFINES_UNIX = [ "SK_SAMPLES_FOR_X", "SK_PDF_USE_SFNTLY", "SK_CODEC_DECODES_RAW", - "SK_HAS_GIF_LIBRARY", "SK_HAS_JPEG_LIBRARY", "SK_HAS_PNG_LIBRARY", "SK_HAS_WEBP_LIBRARY", @@ -579,7 +581,6 @@ DEFINES_UNIX = [ DEFINES_ANDROID = [ "SK_BUILD_FOR_ANDROID", "SK_CODEC_DECODES_RAW", - "SK_HAS_GIF_LIBRARY", "SK_HAS_JPEG_LIBRARY", "SK_HAS_PNG_LIBRARY", "SK_HAS_WEBP_LIBRARY", |