diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index e6d3462aa3..94769dae51 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,3 +1,3 @@ Source: discord-rpc -Version: 2.0.1 +Version: 2.1.0 Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. diff --git a/ports/discord-rpc/fix-debug.diff b/ports/discord-rpc/fix-debug.diff deleted file mode 100644 index df33249b9f..0000000000 --- a/ports/discord-rpc/fix-debug.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -30,7 +30,6 @@ if(WIN32) - set(BASE_RPC_SRC ${BASE_RPC_SRC} connection_win.cpp discord_register_win.cpp) - add_library(discord-rpc ${RPC_LIBRARY_TYPE} ${BASE_RPC_SRC}) - target_compile_options(discord-rpc PRIVATE /EHsc -- /MT - /Wall - /wd4100 # unreferenced formal parameter - /wd4514 # unreferenced inline -@@ -102,13 +101,10 @@ install( - EXPORT "discord-rpc" - RUNTIME - DESTINATION "bin" -- CONFIGURATIONS Release - LIBRARY - DESTINATION "lib" -- CONFIGURATIONS Release - ARCHIVE - DESTINATION "lib" -- CONFIGURATIONS Release - INCLUDES - DESTINATION "include" - ) diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index ea59126a3f..9c35458a3f 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -3,28 +3,19 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO discordapp/discord-rpc - REF v2.0.1 - SHA512 496f8f34184c4be3c3341b05ebd440a9e89e36ecf15747ea8f4d1cc0404f1341404fda6c8358a2c08e0149023775472ea78603b9d41687f1004828523debda99 + REF v2.1.0 + SHA512 24bbc391670bfb53f0501ed189cef8193f35332de9fff3016fc18eb7eab4970d5c90576aa95dfcc4f1ef553e8b1ea781e1e40e595cbbcc1c4200e4ff174369de HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH - ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-debug.diff -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(BUILD_DYNAMIC_LIB ON) -else() - set(BUILD_DYNAMIC_LIB OFF) +set(STATIC_CRT OFF) +if(VCPKG_CRT_LINKAGE STREQUAL static) + set(STATIC_CRT ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DBUILD_DYNAMIC_LIB=${BUILD_DYNAMIC_LIB} + OPTIONS -DUSE_STATIC_CRT=${STATIC_CRT} ) vcpkg_install_cmake()