Compare commits

..

2 commits

Author SHA1 Message Date
9de6766750 SaveTool: add the libcurl version to the about screen. 2022-11-26 11:31:14 +01:00
90ff680aff Main: fix Clang builds.
For some reason, only GCC has setlocale() wrapped in the std namespace.
2022-11-26 11:30:48 +01:00
2 changed files with 4 additions and 1 deletions

View file

@ -24,6 +24,8 @@
#include <zipconf.h> #include <zipconf.h>
#include <curl/curlver.h>
#include "../FontAwesome/IconsFontAwesome5.h" #include "../FontAwesome/IconsFontAwesome5.h"
#include "../FontAwesome/IconsFontAwesome5Brands.h" #include "../FontAwesome/IconsFontAwesome5Brands.h"
@ -255,6 +257,7 @@ void SaveTool::drawAbout() {
} }
if(ImGui::TreeNodeEx("libcurl", ImGuiTreeNodeFlags_SpanAvailWidth)) { if(ImGui::TreeNodeEx("libcurl", ImGuiTreeNodeFlags_SpanAvailWidth)) {
ImGui::Text("Version used: %s", LIBCURL_VERSION);
auto curl_website = "https://curl.se/libcurl"; auto curl_website = "https://curl.se/libcurl";
drawAlignedText(ICON_FA_GLOBE " %s", curl_website); drawAlignedText(ICON_FA_GLOBE " %s", curl_website);
ImGui::SameLine(); ImGui::SameLine();

View file

@ -40,7 +40,7 @@ int main(int argc, char** argv) {
LOG_INFO("Initialising M.A.S.S. Builder Save Tool version " SAVETOOL_VERSION "."); LOG_INFO("Initialising M.A.S.S. Builder Save Tool version " SAVETOOL_VERSION ".");
auto str = std::setlocale(LC_ALL, ".utf-8"); auto str = setlocale(LC_ALL, ".utf-8");
if(str) { if(str) {
Containers::StringView locale{str}; Containers::StringView locale{str};
LOG_INFO_FORMAT("Current locale: {}", locale); LOG_INFO_FORMAT("Current locale: {}", locale);