diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c23e41a6..4616fc5b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type diff --git a/README.md b/README.md index 30652035..c3a4b6a2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
-
+
@@ -36,7 +36,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
shadPS4 is an early PS4 emulator for Windows and Linux written in C++
-To discuss shadPS4 development or suggest ideas, join the [Discord server](https://discord.gg/MyZRaBngxA)
+To discuss shadPS4 development or suggest ideas, join the [Discord server](https://discord.com/invite/MyZRaBngxA)
Check us on [X (twitter)](https://x.com/shadps4) or on our [website](https://shadps4.net/).
@@ -101,4 +101,4 @@ We currently accept any contribution, just open a PR and we will check it :)
# Sister Projects
- [Panda3DS](https://github.com/wheremyfoodat/Panda3DS): A multiplatform 3DS emulator from our co-author wheremyfoodat.
-- [hydra](https://github.com/hydra-emu/hydra): A multisystem, multiplatform emulator (chip-8, GB, NES, N64) from Paris.
+- [hydra](https://github.com/hydra-emu/hydra): A multisystem, multiplatform emulator (chip-8, GB, NES, N64) from OFFTKP.
diff --git a/externals/glslang b/externals/glslang
index 2b19bf7e..4da479aa 160000
--- a/externals/glslang
+++ b/externals/glslang
@@ -1 +1 @@
-Subproject commit 2b19bf7e1bc0b60cf2fe9d33e5ba6b37dfc1cc83
+Subproject commit 4da479aa6afa43e5a2ce4c4148c572a03123faf3
diff --git a/externals/magic_enum b/externals/magic_enum
index db0b726c..173f2225 160000
--- a/externals/magic_enum
+++ b/externals/magic_enum
@@ -1 +1 @@
-Subproject commit db0b726c051f2d631b85793038677caf467a7cfe
+Subproject commit 173f22250c7831566b54d195810a677a694f717a
diff --git a/externals/stb_image.h b/externals/stb_image.h
index a632d543..9eedabed 100644
--- a/externals/stb_image.h
+++ b/externals/stb_image.h
@@ -1,4 +1,4 @@
-/* stb_image - v2.29 - public domain image loader - http://nothings.org/stb
+/* stb_image - v2.30 - public domain image loader - http://nothings.org/stb
no warranty implied; use at your own risk
Do this:
@@ -48,6 +48,7 @@ LICENSE
RECENT REVISION HISTORY:
+ 2.30 (2024-05-31) avoid erroneous gcc warning
2.29 (2023-05-xx) optimizations
2.28 (2023-01-29) many error fixes, security errors, just tons of stuff
2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes
@@ -5159,9 +5160,11 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
// non-paletted with tRNS = constant alpha. if header-scanning, we can stop now.
if (scan == STBI__SCAN_header) { ++s->img_n; return 1; }
if (z->depth == 16) {
- for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
+ for (k = 0; k < s->img_n && k < 3; ++k) // extra loop test to suppress false GCC warning
+ tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
} else {
- for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
+ for (k = 0; k < s->img_n && k < 3; ++k)
+ tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
}
}
break;
diff --git a/externals/zydis b/externals/zydis
index fd3e9a6c..5a68f639 160000
--- a/externals/zydis
+++ b/externals/zydis
@@ -1 +1 @@
-Subproject commit fd3e9a6cc8bdcc617b531feda186699e51664f76
+Subproject commit 5a68f639e4f01604cc7bfc8d313f583a8137e3d3
diff --git a/src/common/version.h b/src/common/version.h
index fd14c18b..0a7e934d 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -8,6 +8,6 @@
namespace Common {
-constexpr char VERSION[] = "0.0.4 WIP";
+constexpr char VERSION[] = "0.0.4";
} // namespace Common