Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -29,7 +29,7 @@ void Core::LoadROM(const std::string &rom_) {
|
||||
cpu->GetMem().LoadROM(isArchive, rom);
|
||||
GameDB::match(cpu->GetMem());
|
||||
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.si.pif.InitDevices(cpu->GetMem().saveType);
|
||||
|
||||
@@ -6,6 +6,10 @@ set(CMAKE_CXX_STANDARD 17)
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
|
||||
find_package(SDL2 CONFIG REQUIRED)
|
||||
|
||||
if(WIN32)
|
||||
add_compile_definitions(NOMINMAX)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
.
|
||||
../
|
||||
|
||||
Reference in New Issue
Block a user