voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
MihailRis 2026-09-14 03:01:32 +03:00
parent 4cb97d48a7
commit bd8d55f8bf
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/macos.yml vendored
View file

@ -23,13 +23,13 @@ jobs:
- name: Install dependencies from brew - name: Install dependencies from brew
run: | 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 - name: Configure
run: | run: |
cmake -DOPENAL_INCLUDE_DIR=$(brew --prefix openal-soft)/include \ cmake -DOPENAL_INCLUDE_DIR=$(brew --prefix openal-soft)/include \
-DOPENAL_LIBRARY=$(brew --prefix openal-soft)/lib/libopenal.dylib \ -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 - name: Build
run: | run: |
@ -49,7 +49,7 @@ jobs:
run: | run: |
chmod +x build/VoxelEngine chmod +x build/VoxelEngine
chmod +x AppDir/usr/bin/vctest 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 - name: Create DMG
run: | run: |
mkdir VoxelEngineDmgContent mkdir VoxelEngineDmgContent

8
src/network/Curl.cpp
View file

@ -126,7 +126,7 @@ public:
} }
} }
{ {
int running; int running;
CURLMcode res = curl_multi_perform(multiHandle, &running); CURLMcode res = curl_multi_perform(multiHandle, &running);
if (res != CURLM_OK) { if (res != CURLM_OK) {
auto message = curl_multi_strerror(res); auto message = curl_multi_strerror(res);
@ -181,7 +181,7 @@ public:
auto& req = entry->request; auto& req = entry->request;
requests.erase(found); requests.erase(found);
int response = -1; long response = -1;
CURLcode result = msg->data.result; CURLcode result = msg->data.result;
curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &response); curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &response);
auto headers = std::move(entry->headers); auto headers = std::move(entry->headers);
@ -190,7 +190,7 @@ public:
logger.error() << message << " (" << req.url << ")"; logger.error() << message << " (" << req.url << ")";
if (req.onResponse) { if (req.onResponse) {
req.onResponse( req.onResponse(
{response, {static_cast<int>(response),
std::move(headers), std::move(headers),
std::vector<char>( std::vector<char>(
message.data(), message.data() + message.size() message.data(), message.data() + message.size()
@ -208,7 +208,7 @@ public:
totalDownload += entry->buffer.size(); totalDownload += entry->buffer.size();
if (req.onResponse) { if (req.onResponse) {
req.onResponse({ req.onResponse({
response, static_cast<int>(response),
std::move(headers), std::move(headers),
std::move(entry->buffer), std::move(entry->buffer),
}); });

4
vctest/main.cpp
View file

@ -183,8 +183,8 @@ static bool run_test(const Config& config, const fs::path& path, bool memcheck =
auto name = path.stem(); auto name = path.stem();
std::stringstream ss; std::stringstream ss;
if (memcheck) { if (memcheck) {
ss << config.memchecker << " --log-file=" ss << config.memchecker << /*" --log-file="
<< fix_path(memcheckLogFile.string()) << " "; << fix_path(memcheckLogFile.string()) <<*/ " ";
} }
ss << fs::canonical(config.executable) << " --headless"; ss << fs::canonical(config.executable) << " --headless";
ss << " --test " << fix_path(path.string()); ss << " --test " << fix_path(path.string());