diff --git a/cmake/DetectArchitecture.cmake b/cmake/DetectArchitecture.cmake index 10bca9cbe3..1db79b3b2e 100644 --- a/cmake/DetectArchitecture.cmake +++ b/cmake/DetectArchitecture.cmake @@ -19,7 +19,6 @@ function(check_instruction_set INSTRUCTION_SET_NAME INSTRUCTION_SET_FLAG INSTRUC set(AVX_FLAG "${INSTRUCTION_SET_FLAG}" PARENT_SCOPE) set(AVX_NAME "${INSTRUCTION_SET_NAME}" PARENT_SCOPE) else() - message(STATUS "Instruction set ${INSTRUCTION_SET_NAME} not supported. Falling back to the previous instruction set.") return() endif() endfunction() @@ -41,16 +40,22 @@ endif() set(CMAKE_REQUIRED_FLAGS_SAVE "${CMAKE_REQUIRED_FLAGS}") set(AVX_NAME "T_Fallback") +if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386")) + + foreach(INSTRUCTION_SET IN LISTS INSTRUCTION_SETS) + string(REPLACE "?" ";" CURRENT_LIST "${INSTRUCTION_SET}") + list(GET CURRENT_LIST 0 INSTRUCTION_SET_NAME) + list(GET CURRENT_LIST 1 INSTRUCTION_SET_FLAG) + string(REPLACE "." ";" INSTRUCTION_SET_FLAG "${INSTRUCTION_SET_FLAG}") + list(GET CURRENT_LIST 2 INSTRUCTION_SET_INTRINSIC) + string(REPLACE "." ";" INSTRUCTION_SET_INTRINSIC "${INSTRUCTION_SET_INTRINSIC}") + check_instruction_set("${INSTRUCTION_SET_NAME}" "${INSTRUCTION_SET_FLAG}" "${INSTRUCTION_SET_INTRINSIC}") + endforeach() + + string(REPLACE "T_" "" AVX_DISPLAY ${AVX_NAME}) + message(STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} SSE type: ${AVX_DISPLAY}") +else() + message(STATUS "SSE not supported by architecture ${CMAKE_SYSTEM_PROCESSOR}") +endif() -foreach(INSTRUCTION_SET IN LISTS INSTRUCTION_SETS) - string(REPLACE "?" ";" CURRENT_LIST "${INSTRUCTION_SET}") - list(GET CURRENT_LIST 0 INSTRUCTION_SET_NAME) - list(GET CURRENT_LIST 1 INSTRUCTION_SET_FLAG) - string(REPLACE "." ";" INSTRUCTION_SET_FLAG "${INSTRUCTION_SET_FLAG}") - list(GET CURRENT_LIST 2 INSTRUCTION_SET_INTRINSIC) - string(REPLACE "." ";" INSTRUCTION_SET_INTRINSIC "${INSTRUCTION_SET_INTRINSIC}") - check_instruction_set("${INSTRUCTION_SET_NAME}" "${INSTRUCTION_SET_FLAG}" "${INSTRUCTION_SET_INTRINSIC}") -endforeach() - -message(STATUS "Detected CPU Architecture: ${AVX_NAME}") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_SAVE}") diff --git a/include/dpp/cluster_coro_calls.h b/include/dpp/cluster_coro_calls.h index d6916ef66a..a6d0604eec 100644 --- a/include/dpp/cluster_coro_calls.h +++ b/include/dpp/cluster_coro_calls.h @@ -1799,7 +1799,7 @@ [[nodiscard]] async co_nitro_sticker_get(snowflake id); /** - * @brief Get sticker packs + * @brief Get a list of available sticker packs * @see dpp::cluster::sticker_packs_get * @see https://discord.com/developers/docs/resources/sticker#list-nitro-sticker-packs * @return sticker_pack_map returned object on completion diff --git a/include/dpp/cluster_sync_calls.h b/include/dpp/cluster_sync_calls.h index 01b59fbf5e..7ae7d3f54a 100644 --- a/include/dpp/cluster_sync_calls.h +++ b/include/dpp/cluster_sync_calls.h @@ -2207,7 +2207,7 @@ sticker_map guild_stickers_get_sync(snowflake guild_id); sticker nitro_sticker_get_sync(snowflake id); /** - * @brief Get sticker packs + * @brief Get a list of available sticker packs * @see dpp::cluster::sticker_packs_get * @see https://discord.com/developers/docs/resources/sticker#list-nitro-sticker-packs * @return sticker_pack_map returned object on completion