Index: cmake/CMakeLists.txt |
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt |
index 58c04db8d935b3d336ab76065829b970bfa0563d..157ea2b91d008b22c2194ae871c25adf678d5e47 100644 |
--- a/cmake/CMakeLists.txt |
+++ b/cmake/CMakeLists.txt |
@@ -113,7 +113,7 @@ if (WIN32) |
endif() |
remove_srcs(../src/gpu/gl/angle/*) # TODO |
-remove_srcs(../src/codec/* ../src/android/*) # TODO: Requires Chromium's libjpeg-turbo, and incompatible giflib. |
+remove_srcs(../src/android/*) |
# Certain files must be compiled with support for SSSE3, SSE4.1, AVX, or AVX2 intrinsics. |
file (GLOB_RECURSE ssse3_srcs ../src/*ssse3*.cpp ../src/*SSSE3*.cpp) |
@@ -159,6 +159,8 @@ if (GIF_FOUND) |
list (APPEND private_includes ${GIF_INCLUDE_DIRS}) |
list (APPEND libs ${GIF_LIBRARIES}) |
else() |
+ remove_srcs(../src/codec/SkCodec.cpp) |
+ remove_srcs(../src/codec/*Gif*.cpp) |
remove_srcs(../src/images/*gif*) |
endif() |
@@ -166,6 +168,8 @@ if (JPEG_FOUND) |
list (APPEND private_includes ${JPEG_INCLUDE_DIRS}) |
list (APPEND libs ${JPEG_LIBRARIES}) |
else() |
+ remove_srcs(../src/codec/*Jpeg*.cpp) |
+ remove_srcs(../src/codec/*Raw*.cpp) |
remove_srcs(../src/images/*jpeg*) |
endif() |
@@ -180,6 +184,8 @@ if (PNG_FOUND) |
list (APPEND private_includes ${PNG_INCLUDE_DIRS}) |
list (APPEND libs ${PNG_LIBRARIES}) |
else() |
+ remove_srcs(../src/codec/*Png*.cpp) |
+ remove_srcs(../src/codec/*Ico*.cpp) |
remove_srcs(../src/images/*png*) |
endif() |
@@ -195,6 +201,7 @@ if (WEBP_INCLUDE_DIRS AND WEBP_LIBRARIES) |
list (APPEND private_includes ${WEBP_INCLUDE_DIRS}) |
list (APPEND libs ${WEBP_LIBRARIES}) |
else() |
+ remove_srcs(../src/codec/SkWebpCodec.cpp) |
remove_srcs(../src/images/*webp*) |
endif() |