diff --git a/3rdParty/discord/.editorconfig b/3rdParty/discord/.editorconfig new file mode 100644 index 000000000..d7bfbf809 --- /dev/null +++ b/3rdParty/discord/.editorconfig @@ -0,0 +1,2 @@ +[*.patch] +end_of_line = lf diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt index 16520f0e3..c7cd33dce 100644 --- a/3rdParty/discord/CMakeLists.txt +++ b/3rdParty/discord/CMakeLists.txt @@ -4,6 +4,7 @@ include(FetchContent) FetchContent_Declare(discordsrc URL https://dl-game-sdk.discordapp.net/2.5.6/discord_game_sdk.zip URL_HASH MD5=f86f15957cc9fbf04e3db10462027d58 + PATCH_COMMAND patch -p0 < "${CMAKE_CURRENT_LIST_DIR}/fix-types-h.patch" ) FetchContent_MakeAvailableExcludeFromAll(discordsrc) @@ -23,7 +24,7 @@ if(WIN32 AND NOT MSVC) set_target_properties(discord_game_sdk PROPERTIES PREFIX "") else() find_library(DISCORD_LIB discord_game_sdk${CMAKE_SHARED_LIBRARY_SUFFIX} ${DISCORD_LIB_DIR}) - + add_library(discord_game_sdk SHARED IMPORTED GLOBAL) set_property(TARGET discord_game_sdk PROPERTY IMPORTED_IMPLIB ${DISCORD_LIB}) set_property(TARGET discord_game_sdk PROPERTY IMPORTED_LOCATION ${DISCORD_SHARED_LIB}) diff --git a/3rdParty/discord/fix-types-h.patch b/3rdParty/discord/fix-types-h.patch new file mode 100644 index 000000000..31c7491e4 --- /dev/null +++ b/3rdParty/discord/fix-types-h.patch @@ -0,0 +1,10 @@ +--- cpp/types.h 2022-08-30 09:49:34.940037347 +0900 ++++ cpp/types.h 2022-08-30 09:44:44.235036008 +0900 +@@ -1,5 +1,7 @@ + #pragma once + ++#include ++ + #include "ffi.h" + #include "event.h" +