From bd8d55f8bf0d56ff31c179cbda46776f3e5de0aa Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 14 Sep 2026 03:01:32 +0300 Subject: [PATCH] fix --- .github/workflows/macos.yml | 6 +++--- src/network/Curl.cpp | 8 ++++---- vctest/main.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2f131de72..2bcb56dda 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,13 +23,13 @@ jobs: - name: Install dependencies from brew run: | - brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm freetype + brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm freetype - name: Configure run: | cmake -DOPENAL_INCLUDE_DIR=$(brew --prefix openal-soft)/include \ -DOPENAL_LIBRARY=$(brew --prefix openal-soft)/lib/libopenal.dylib \ - -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1 -DVC_BUILD_NAME="${{ inputs.build_name }}" + -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1 -DVC_BUILD_NAME="${{ inputs.build_name }}" - name: Build run: | @@ -49,7 +49,7 @@ jobs: run: | chmod +x build/VoxelEngine chmod +x AppDir/usr/bin/vctest - AppDir/usr/bin/vctest -e build/VoxelEngine -d dev/tests -u build --output-always + AppDir/usr/bin/vctest -e build/VoxelEngine -d dev/tests -u build --output-always --memchecker "lldb -batch -o 'run' -o 'thread backtrace all' -o 'quit' -- " - name: Create DMG run: | mkdir VoxelEngineDmgContent diff --git a/src/network/Curl.cpp b/src/network/Curl.cpp index 65dce2f00..66ffe170a 100644 --- a/src/network/Curl.cpp +++ b/src/network/Curl.cpp @@ -126,7 +126,7 @@ public: } } { - int running; + int running; CURLMcode res = curl_multi_perform(multiHandle, &running); if (res != CURLM_OK) { auto message = curl_multi_strerror(res); @@ -181,7 +181,7 @@ public: auto& req = entry->request; requests.erase(found); - int response = -1; + long response = -1; CURLcode result = msg->data.result; curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &response); auto headers = std::move(entry->headers); @@ -190,7 +190,7 @@ public: logger.error() << message << " (" << req.url << ")"; if (req.onResponse) { req.onResponse( - {response, + {static_cast(response), std::move(headers), std::vector( message.data(), message.data() + message.size() @@ -208,7 +208,7 @@ public: totalDownload += entry->buffer.size(); if (req.onResponse) { req.onResponse({ - response, + static_cast(response), std::move(headers), std::move(entry->buffer), }); diff --git a/vctest/main.cpp b/vctest/main.cpp index ee2f15e5b..953d59aa9 100644 --- a/vctest/main.cpp +++ b/vctest/main.cpp @@ -183,8 +183,8 @@ static bool run_test(const Config& config, const fs::path& path, bool memcheck = auto name = path.stem(); std::stringstream ss; if (memcheck) { - ss << config.memchecker << " --log-file=" - << fix_path(memcheckLogFile.string()) << " "; + ss << config.memchecker << /*" --log-file=" + << fix_path(memcheckLogFile.string()) <<*/ " "; } ss << fs::canonical(config.executable) << " --headless"; ss << " --test " << fix_path(path.string());