Emulator-Archive/mandarine
1
0
Fork 0
mirror of https://github.com/mandarine3ds/mandarine.git synced 2024-11-23 06:09:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

externals: update SDL

Browse Source
This commit is contained in:
Gamer64 2024-09-10 00:08:30 +02:00
parent 2a195e6f6d
commit df439aede2
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -8,9 +8,14 @@ cmake_policy(SET CMP0069 NEW)
# Honor visibility properties for all targets
# Set the default so subdirectory cmake_minimum_required calls won't unset the policy.
cmake_policy(SET CMP0063 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
# Needed to compile sdl2 2.30.5+ on MSVC
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
# Allow use with targets in other directories
cmake_policy(SET CMP0079 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0079 NEW)
# Allow conditions to be used in cmake_dependent_option
cmake_policy(SET CMP0127 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")

3
externals/CMakeLists.txt vendored
View File

@ -186,6 +186,9 @@ add_subdirectory(teakra EXCLUDE_FROM_ALL)
# SDL2
if (ENABLE_SDL2 AND NOT USE_SYSTEM_SDL2)
if (MSVC)
set (SDL_LIBC ON)
endif()
add_subdirectory(sdl2)
endif()

2
externals/cubeb vendored

@ -1 +1 @@
Subproject commit 799e775484b8fce7e986ee7a4f4b651fec2bca07
Subproject commit 19d2f7bce6a4d0566a07f3187d2bc5f0ec95c1c4

2
externals/sdl2/SDL vendored

@ -1 +1 @@
Subproject commit ac13ca9ab691e13e8eebe9684740ddcb0d716203
Subproject commit 54757c29dd4e8783d57e6b0d2261bd00f66c3f0d

4
src/core/core.cpp
View File

@ -262,7 +262,7 @@ static void LoadOverrides(u64 title_id) {
}
// Fully tested games that runs better and without issues with this tweak.
const std::array<u64, 8> force_hw_vertex_shaders_ids = {
const std::array<u64, 8> force_hw_vs_ids = {
0x0004000000068B00, // Tales of the Abyss / Pac Man Party 3D
0x0004000000061300, // Tales of the Abyss / Pac Man Party 3D
0x000400000004A700, // Tales of the Abyss / Pac Man Party 3D
@ -272,7 +272,7 @@ static void LoadOverrides(u64 title_id) {
0x000400000016AD00, // Dragon Quest Monsters Joker 3
0x00040000001ACB00 // Dragon Quest Monsters Joker 3 Professional
};
for (auto id : force_hw_vertex_shaders_ids) {
for (auto id : force_hw_vs_ids) {
if (title_id == id) {
Settings::values.force_hw_vertex_shaders = true;
break;