summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-12-14 00:50:25 +0100
committersfan5 <sfan5@live.de>2022-01-15 17:44:22 +0100
commita90b2a4d4f38e92b4016d9ac86e001398be729e7 (patch)
tree6219701e177f76c493b53af0be55f262cfaf2c40
parent97248c695730c29ca91fb7e56456d061f77744f5 (diff)
downloadminetest-a90b2a4d4f38e92b4016d9ac86e001398be729e7.tar.gz
minetest-a90b2a4d4f38e92b4016d9ac86e001398be729e7.tar.bz2
minetest-a90b2a4d4f38e92b4016d9ac86e001398be729e7.zip
Raise minimum compiler versions
Supporting these is not reasonable anymore and effectively we didn't do that anyway, brokenness was only noticed by chance and a PR to restore support for gcc 5.x is ready now.
-rw-r--r--CMakeLists.txt9
-rw-r--r--README.md2
2 files changed, 3 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b4b9f4f5..f9fccf912 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,8 @@ project(minetest)
set(PROJECT_NAME_CAPITALIZED "Minetest")
set(CMAKE_CXX_STANDARD 11)
-set(GCC_MINIMUM_VERSION "4.8")
-set(CLANG_MINIMUM_VERSION "3.4")
+set(GCC_MINIMUM_VERSION "5.1")
+set(CLANG_MINIMUM_VERSION "3.5")
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
set(VERSION_MAJOR 5)
@@ -267,11 +267,6 @@ if(NOT USE_LUAJIT)
add_subdirectory(lib/bitop)
endif()
-# JsonCpp doesn't compile well on GCC 4.8
-if(NOT USE_SYSTEM_JSONCPP)
- set(GCC_MINIMUM_VERSION "4.9")
-endif()
-
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${GCC_MINIMUM_VERSION}")
message(FATAL_ERROR "Insufficient gcc version, found ${CMAKE_CXX_COMPILER_VERSION}. "
diff --git a/README.md b/README.md
index 03a161c9a..b3d2981f6 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ Compiling
| Dependency | Version | Commentary |
|------------|---------|------------|
-| GCC | 4.9+ | Can be replaced with Clang 3.4+ |
+| GCC | 5.1+ | or Clang 3.5+ |
| CMake | 3.5+ | |
| IrrlichtMt | - | Custom version of Irrlicht, see https://github.com/minetest/irrlicht |
| Freetype | 2.0+ | |