shifathosn
/
KytyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix windows compialtion (2)

This commit is contained in:
nmzik 2026-10-11 10:43:36 +02:00
parent 6f0cddd440
commit 3d7c5504d7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -40,6 +40,11 @@ if (NOT (WIN32 OR LINUX OR APPLE))
message(FATAL_ERROR "only Windows, Linux, and macOS builds are supported") message(FATAL_ERROR "only Windows, Linux, and macOS builds are supported")
endif() endif()
if(WIN32)
# Prevent Windows headers from defining min/max macros in all targets.
add_compile_definitions(NOMINMAX)
endif()
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

4
src/graphics/shader/recompiler/ir/passes/SrtWalker.cpp
View File

@ -405,7 +405,7 @@ void CompileSrtWalker(ResourcePlan& program) {
if (reg < program.user_data_base || if (reg < program.user_data_base ||
RegIndex(high->Arg(0).ScalarRegister()) != reg + 1u) return; RegIndex(high->Arg(0).ScalarRegister()) != reg + 1u) return;
const auto base = reg - program.user_data_base; const auto base = reg - program.user_data_base;
user_data_count = std::max<uint32_t>(user_data_count, base + 2u); user_data_count = std::max(user_data_count, base + 2u);
uses = &roots[base]; uses = &roots[base];
} else { } else {
const auto lo = offsets.find(low); const auto lo = offsets.find(low);
@ -794,7 +794,7 @@ bool SrtWalker::EvaluateInst(const Inst& inst, uint64_t& result) {
return false; return false;
case ValueOpcode::UMin32: case ValueOpcode::UMin32:
if (binary()) { if (binary()) {
result = std::min<uint32_t>(static_cast<uint32_t>(a), static_cast<uint32_t>(b)); result = std::min(static_cast<uint32_t>(a), static_cast<uint32_t>(b));
return true; return true;
} }
return false; return false;