From e172d6cff6e39b0f45ebe9562d233c7bba1d0551 Mon Sep 17 00:00:00 2001 From: mq1n Date: Sat, 23 Aug 2025 09:28:17 +0300 Subject: [PATCH 1/2] Update CMake minimum required version to 3.10 Raised the minimum required CMake version to 3.10 in cryptopp and zlib CMakeLists.txt files to ensure compatibility with newer CMake features and improve build consistency --- vendor/cryptopp/CMakeLists.txt | 2 +- vendor/lzo-2.10/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) From 3090b79139c6ae7bc40d834dc66b1add74da3fa5 Mon Sep 17 00:00:00 2001 From: mq1n Date: Sat, 23 Aug 2025 09:29:38 +0300 Subject: [PATCH 2/2] Fix WIN32_LEAN_AND_MEAN warning spam Added a check before defining WIN32_LEAN_AND_MEAN to prevent redefinition warnings or errors --- src/EterLib/StdAfx.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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