From 0984bd729a2c196d185243dde98bb182f902d8fb Mon Sep 17 00:00:00 2001 From: Psycrow Date: Mon, 21 Nov 2022 23:38:34 +0300 Subject: [PATCH] Added NOMINMAX defination --- CMakeLists.txt | 1 + src/editor/Gui.cpp | 1 - src/filedialog/ImFileDialog.cpp | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4ea7be5..0e56fa27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,6 +198,7 @@ if(MSVC) source_group("Source Files\\filedialog" FILES src/filedialog/ImFileDialog.c) add_definitions(-DUSE_FILESYSTEM) + add_definitions(-DNOMINMAX) else() target_link_libraries(${PROJECT_NAME} GL GLU X11 Xxf86vm Xrandr pthread Xi GLEW stdc++fs) if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.1") diff --git a/src/editor/Gui.cpp b/src/editor/Gui.cpp index eda625db..b33c5cc8 100644 --- a/src/editor/Gui.cpp +++ b/src/editor/Gui.cpp @@ -19,7 +19,6 @@ #include "imgui_stdlib.h" #ifdef WIN32 -#define NOMINMAX #include #else #define MAX_PATH 256 diff --git a/src/filedialog/ImFileDialog.cpp b/src/filedialog/ImFileDialog.cpp index 4115d004..912df40c 100644 --- a/src/filedialog/ImFileDialog.cpp +++ b/src/filedialog/ImFileDialog.cpp @@ -14,7 +14,6 @@ #include "stb_image.h" #ifdef _WIN32 -#define NOMINMAX #include #include #include