Skip to content

Commit adcbfe5

Browse files
committed
Fix MSVC build
1 parent feb9d9e commit adcbfe5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
1212
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
1313
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
1414

15-
project(vkhandybug VERSION "0.6.0")
15+
project(vkhandybug VERSION "0.6.2")
1616

1717
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/frontend/configure.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/frontend/configure.h")
1818

frontend/gui/menu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void Menu::render_popups()
141141
{
142142
#ifdef _MSC_VER
143143
auto sep = std::wstring(&std::filesystem::path::preferred_separator);
144-
Config::getInstance().store().last_rom_folder = ImGuiFileDialog::Instance()->GetCurrentPath() + std::string(sep.begin(), sep.end());
144+
Config::get_instance().store().last_rom_folder = ImGuiFileDialog::Instance()->GetCurrentPath() + std::string(sep.begin(), sep.end());
145145
#else
146146
Config::get_instance().store().last_rom_folder = ImGuiFileDialog::Instance()->GetCurrentPath() + std::filesystem::path::preferred_separator;
147147
#endif

frontend/include/global.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
#include <iterator>
2727
#include <future>
2828

29+
#ifndef MIN
30+
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
31+
#endif
32+
2933
enum LynxButtons
3034
{
3135
LynxButtons_Up = 0,

0 commit comments

Comments
 (0)