diff --git a/src/EterLib/StdAfx.h b/src/EterLib/StdAfx.h index b9698fb..485e790 100644 --- a/src/EterLib/StdAfx.h +++ b/src/EterLib/StdAfx.h @@ -1,6 +1,8 @@ #pragma once -#define WIN32_LEAN_AND_MEAN +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS #endif diff --git a/vendor/cryptopp/CMakeLists.txt b/vendor/cryptopp/CMakeLists.txt index b36e982..9569e1e 100644 --- a/vendor/cryptopp/CMakeLists.txt +++ b/vendor/cryptopp/CMakeLists.txt @@ -31,7 +31,7 @@ message( STATUS "CMake version ${CMAKE_VERSION}" ) message( STATUS "System ${CMAKE_SYSTEM_NAME}" ) message( STATUS "Processor ${CMAKE_SYSTEM_PROCESSOR}" ) -cmake_minimum_required(VERSION 2.8.6) +cmake_minimum_required(VERSION 3.10) if (${CMAKE_VERSION} VERSION_LESS "3.0.0") project(cryptopp) set(cryptopp_VERSION_MAJOR 8) diff --git a/vendor/lzo-2.10/CMakeLists.txt b/vendor/lzo-2.10/CMakeLists.txt index 67e771d..d8044c7 100644 --- a/vendor/lzo-2.10/CMakeLists.txt +++ b/vendor/lzo-2.10/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project(lzo2 VERSION 2.10 LANGUAGES C)