Skip to content

Commit 95a15a7

Browse files
committed
fix cmake&clang build
1 parent ab09b09 commit 95a15a7

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ if (WIN32)
111111
if (MSVC)
112112
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
113113
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
114+
add_definitions(-DNOMINMAX)
114115
if (NOT CLANG)
115-
add_definitions(-DNOMINMAX)
116116
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
117117
endif()
118118
endif()

src/viewer/scrollview.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
///////////////////////////////////////////////////////////////////////
1919
//
2020

21-
#define NOMINMAX
22-
2321
#include <algorithm>
2422
#include <climits>
2523
#include <cstdarg>

0 commit comments

Comments
 (0)