From b284ea076b98cb254b67d48d8b4bcc33bb90a5e6 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 30 Nov 2023 15:43:07 +0100 Subject: [PATCH 1/2] Use newer vcpkg in Windows CI --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb80bbb..fe853d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -195,8 +195,8 @@ jobs: name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }} runs-on: windows-2019 env: - VCPKG_VERSION: 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44 - # 2022.05.10 + VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50 + # 2023.10.19 vcpkg_packages: zlib libpng libjpeg-turbo opengl-registry strategy: fail-fast: false -- 2.47.0 From a2884e40000548a48b1e39842bbdc4558bc3b918 Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Thu, 30 Nov 2023 21:52:04 +0700 Subject: [PATCH 2/2] Android: Make ALooper_pollAll call always non-blocking (#255) --- source/Irrlicht/Android/CIrrDeviceAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Irrlicht/Android/CIrrDeviceAndroid.cpp b/source/Irrlicht/Android/CIrrDeviceAndroid.cpp index fe66731..b1df885 100644 --- a/source/Irrlicht/Android/CIrrDeviceAndroid.cpp +++ b/source/Irrlicht/Android/CIrrDeviceAndroid.cpp @@ -106,7 +106,7 @@ bool CIrrDeviceAndroid::run() s32 Events = 0; android_poll_source* Source = 0; - while ((id = ALooper_pollAll(((Focused && !Paused) || !Initialized) ? 0 : -1, 0, &Events, (void**)&Source)) >= 0) + while ((id = ALooper_pollAll(0, 0, &Events, (void**)&Source)) >= 0) { if(Source) Source->process(Android, Source); -- 2.47.0