2020-01-15 07:26:58 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 9503daacb..2fb9ef137 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -167,6 +167,9 @@ add_definitions(-DHAVE_CONFIG_H)
|
|
|
|
|
if(MSVC)
|
|
|
|
|
# avoid security warnings for e.g., fopen() used in the examples.
|
|
|
|
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+ if(BUILD_SHARED_LIBS)
|
|
|
|
|
+ add_definitions("-DWEBP_EXTERN=__declspec(dllexport)" "-DWEBP_DLL")
|
|
|
|
|
+ endif()
|
|
|
|
|
else()
|
|
|
|
|
add_definitions(-Wall)
|
|
|
|
|
endif()
|
|
|
|
|
@@ -420,9 +423,9 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
|
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\
|
|
|
|
|
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
|
|
|
|
|
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;")
|
|
|
|
|
- set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
|
2020-01-17 02:39:47 +08:00
|
|
|
+ set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME $<$<PLATFORM_ID:Windows>:lib>webpmux)
|
2020-01-15 07:26:58 +08:00
|
|
|
list(APPEND INSTALLED_LIBRARIES libwebpmux)
|
|
|
|
|
configure_pkg_config("src/mux/libwebpmux.pc")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if(WEBP_BUILD_GIF2WEBP)
|
2020-02-03 18:21:47 +08:00
|
|
|
@@ -524,7 +528,11 @@ if(WEBP_BUILD_EXTRAS)
|
2020-01-15 07:26:58 +08:00
|
|
|
|
|
|
|
|
# webp_quality
|
|
|
|
|
add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS})
|
|
|
|
|
target_link_libraries(webp_quality exampleutil imagedec)
|
|
|
|
|
+ if(BUILD_SHARED_LIBS)
|
|
|
|
|
+ target_link_libraries(webp_quality webpdspdecode)
|
|
|
|
|
+ endif()
|
|
|
|
|
target_include_directories(webp_quality
|
|
|
|
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
|
2020-02-03 18:21:47 +08:00
|
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/src
|
2020-01-15 07:26:58 +08:00
|
|
|
${CMAKE_CURRENT_BINARY_DIR})
|
2020-02-03 20:45:56 +08:00
|
|
|
@@ -573,7 +573,7 @@ if(WEBP_BUILD_WEBP_JS)
|
|
|
|
|
"-s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \
|
|
|
|
|
-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)
|
|
|
|
|
+ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H)
|
|
|
|
|
|
|
|
|
|
# WASM version
|
|
|
|
|
add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
|
