From 28bbd565917d59b20458e5de783096bc332c1965 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sat, 22 Oct 2016 18:15:51 +0200 Subject: Add SBC decoding support to Windows Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- packaging/nsis/CMakeLists.txt | 2 +- packaging/wix/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packaging') diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 1fcec3f496..1fe07dfd1d 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -131,7 +131,7 @@ set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh") set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} - ${LZ4_DLL} ${NGHTTP2_DLL} ${SMI_DLL} ${SNAPPY_DLL} + ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 99b3ecdea1..56893a78fd 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -123,7 +123,7 @@ file(APPEND "${_all_manifest_wix}" " \n") SET(unique_component "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} - ${LZ4_DLL} ${NGHTTP2_DLL} ${SMI_DLL} ${SNAPPY_DLL} + ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files @@ -148,7 +148,7 @@ file(APPEND "${_all_manifest_wix}" "