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

SimoZ64 · Sep 2, 2024 · 46f820a · 46f820a
2 parents 73b4c7f + 24d4173
commit 46f820a
Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/backend/Core.cpp b/src/backend/Core.cpp
@@ -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);

diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt
@@ -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(
   .
   ../