dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-05 00:16:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: disable webp.js if WEBP_ENABLE_SIMD=1

Browse Source 
wasm2js doesn't support SIMD, fixes link error

Change-Id: I3d9d3cb5f29434bf6c0c0029c07540a9768f9b95
This commit is contained in:
James Zern 2020-11-23 18:47:05 -08:00
parent 5abb55823b
commit d2e245ea9e
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -41,6 +41,10 @@ if(WEBP_BUILD_WEBP_JS)
set(WEBP_BUILD_WEBPINFO OFF) set(WEBP_BUILD_WEBPINFO OFF)
set(WEBP_BUILD_WEBPMUX OFF) set(WEBP_BUILD_WEBPMUX OFF)
set(WEBP_BUILD_EXTRAS OFF) set(WEBP_BUILD_EXTRAS OFF)
if(WEBP_ENABLE_SIMD)
message("wasm2js does not support SIMD, disabling webp.js generation.")
endif()
endif() endif()
set(WEBP_DEP_LIBRARIES) set(WEBP_DEP_LIBRARIES)
@ -582,18 +586,21 @@ if(WEBP_BUILD_EXTRAS)
endif() endif()
if(WEBP_BUILD_WEBP_JS) if(WEBP_BUILD_WEBP_JS)
# JavaScript version # wasm2js does not support SIMD.
add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) if(NOT WEBP_ENABLE_SIMD)
target_link_libraries(webp_js webpdecoder SDL) # JavaScript version
target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
set(WEBP_HAVE_SDL 1) target_link_libraries(webp_js webpdecoder SDL)
set_target_properties( target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
webp_js set(WEBP_HAVE_SDL 1)
PROPERTIES LINK_FLAGS "-s WASM=0 \ set_target_properties(
-s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ webp_js
-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") PROPERTIES LINK_FLAGS "-s WASM=0 \
set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \
target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'")
set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp)
target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL)
endif()
# WASM version # WASM version
add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)

3
README.webp_js
View File

@ -78,3 +78,6 @@ Caveat:
https://github.com/kripken/emscripten/issues/3788 https://github.com/kripken/emscripten/issues/3788
Therefore, SSE2 optimization is currently disabled in CMakeLists.txt. Therefore, SSE2 optimization is currently disabled in CMakeLists.txt.
- If WEBP_ENABLE_SIMD is set to 1 the JavaScript version (webp.js) will be
disabled as wasm2js does not support SIMD.