diff --git a/Telegram/SourceFiles/data/data_msg_id.h b/Telegram/SourceFiles/data/data_msg_id.h index 9ed1d3036a..bd8d183d36 100644 --- a/Telegram/SourceFiles/data/data_msg_id.h +++ b/Telegram/SourceFiles/data/data_msg_id.h @@ -107,7 +107,7 @@ static_assert(-(SpecialMsgIdShift + 0xFF) > ServerMaxMsgId); return MsgId(StartClientMsgId.bare + index); } -[[nodiscrd]] constexpr inline bool IsStoryMsgId(MsgId id) noexcept { +[[nodiscard]] constexpr inline bool IsStoryMsgId(MsgId id) noexcept { return (id >= StartStoryMsgId && id < EndStoryMsgId); } [[nodiscard]] constexpr inline StoryId StoryIdFromMsgId(MsgId id) noexcept { diff --git a/Telegram/cmake/telegram_apple_swift_runtime.cmake b/Telegram/cmake/telegram_apple_swift_runtime.cmake index 36125c26f9..3b331a7b41 100644 --- a/Telegram/cmake/telegram_apple_swift_runtime.cmake +++ b/Telegram/cmake/telegram_apple_swift_runtime.cmake @@ -9,8 +9,18 @@ function(telegram_add_apple_swift_runtime target_name) return() endif() + execute_process( + COMMAND xcode-select -p + OUTPUT_VARIABLE DEVELOPER_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + set(SWIFT_LIB_DIR + "${DEVELOPER_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx") + target_link_options(${target_name} PRIVATE + "-L${SWIFT_LIB_DIR}" "-Wl,-rpath,/usr/lib/swift" "-Wl,-rpath,@executable_path/../Frameworks" ) @@ -24,4 +34,4 @@ function(telegram_add_apple_swift_runtime target_name) --destination $/../Frameworks VERBATIM ) -endfunction() +endfunction() \ No newline at end of file diff --git a/Telegram/lib_translate b/Telegram/lib_translate index e65fc00f72..03534a63dc 160000 --- a/Telegram/lib_translate +++ b/Telegram/lib_translate @@ -1 +1 @@ -Subproject commit e65fc00f723cec2bae1927ed8d45fd7067025e3a +Subproject commit 03534a63dcd115b05e3e1e75abfe0acdb0235eb3 diff --git a/cmake b/cmake index 34de471d6f..4088db229d 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 34de471d6f99077fea60a76d60b2a05ece2abbb1 +Subproject commit 4088db229d9132e1ff2e6758ad7ae28e5116fea6