Merge branch 'dev' into fix-staticbuild

brainboxdotcc · Oct 18, 2024 · f04471e · f04471e
2 parents d169dcc + 0362ef4
commit f04471e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,6 +34,7 @@ option(DPP_TEST_VCPKG "Force VCPKG build without VCPKG installed (for developmen
 include(CheckCXXSymbolExists)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 add_compile_definitions(DPP_BUILD)
+add_compile_definitions(NOMINMAX)
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/colour.cmake")
 
@@ -150,4 +151,4 @@ endif()
 
 if (NOT WIN32)
 	target_link_libraries(dpp PRIVATE std::filesystem)
-endif()
+endif()