iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
SimoneN64
2024-09-02 23:23:06 +02:00
parent 73b4c7f19a 24d4173396
commit 46f820afcd
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/Core.cpp
View File

@@ -29,7 +29,7 @@ void Core::LoadROM(const std::string &rom_) {
cpu->GetMem().LoadROM(isArchive, rom); cpu->GetMem().LoadROM(isArchive, rom);
GameDB::match(cpu->GetMem()); GameDB::match(cpu->GetMem());
if (cpu->GetMem().rom.gameNameDB.empty()) { if (cpu->GetMem().rom.gameNameDB.empty()) {
cpu->GetMem().rom.gameNameDB = fs::path(rom).stem(); cpu->GetMem().rom.gameNameDB = fs::path(rom).stem().string();
} }
cpu->GetMem().mmio.vi.isPal = cpu->GetMem().IsROMPAL(); cpu->GetMem().mmio.vi.isPal = cpu->GetMem().IsROMPAL();
cpu->GetMem().mmio.si.pif.InitDevices(cpu->GetMem().saveType); cpu->GetMem().mmio.si.pif.InitDevices(cpu->GetMem().saveType);

4
src/frontend/CMakeLists.txt
View File

@@ -6,6 +6,10 @@ set(CMAKE_CXX_STANDARD 17)
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
find_package(SDL2 CONFIG REQUIRED) find_package(SDL2 CONFIG REQUIRED)
if(WIN32)
add_compile_definitions(NOMINMAX)
endif()
include_directories( include_directories(
. .
../ ../