mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 15:09:08 +08:00
8e0a801c62
* [libwebp] update to 1.2.1 * update version * Convert patch CRLF to LF * update version * update patch and portfile,cmake * update version * update portifile.cmake * update portfile.cmake * update version * update portfile.cmake * update version * revert portfile.cmake * update version * add trailing line break * update version
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 91a4ba8..10a3f4d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -624,11 +624,12 @@ endif()
|
|
|
|
if(WEBP_BUILD_WEBP_JS)
|
|
# wasm2js does not support SIMD.
|
|
+ find_package(SDL REQUIRED)
|
|
if(NOT WEBP_ENABLE_SIMD)
|
|
# JavaScript version
|
|
add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
|
|
- target_link_libraries(webp_js webpdecoder SDL)
|
|
- target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
+ target_link_libraries(webp_js webpdecoder ${SDL_LIBRARY})
|
|
+ target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR})
|
|
set(WEBP_HAVE_SDL 1)
|
|
set_target_properties(
|
|
webp_js
|
|
@@ -641,14 +642,14 @@ if(WEBP_BUILD_WEBP_JS)
|
|
|
|
# WASM version
|
|
add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
|
|
- target_link_libraries(webp_wasm webpdecoder SDL)
|
|
- target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
+ target_link_libraries(webp_wasm webpdecoder ${SDL_LIBRARY})
|
|
+ target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR})
|
|
set_target_properties(
|
|
webp_wasm
|
|
PROPERTIES LINK_FLAGS "-s WASM=1 \
|
|
-s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \
|
|
-s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'")
|
|
- target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL)
|
|
+ target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H)
|
|
|
|
target_compile_definitions(webpdspdecode PUBLIC EMSCRIPTEN)
|
|
endif()
|