fix cmake&clang build

This commit is contained in:
zdenop 2019-04-06 15:31:53 +02:00
parent ab09b09da6
commit 95a15a7a82
2 changed files with 1 additions and 3 deletions

View File

@ -111,8 +111,8 @@ if (WIN32)
if (MSVC) if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
add_definitions(-DNOMINMAX)
if (NOT CLANG) if (NOT CLANG)
add_definitions(-DNOMINMAX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif() endif()
endif() endif()

View File

@ -18,8 +18,6 @@
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// //
#define NOMINMAX
#include <algorithm> #include <algorithm>
#include <climits> #include <climits>
#include <cstdarg> #include <cstdarg>