Increase cmake minimum version and CXX_STANDARD to 20

CMakeLists.txt

@@ -1,14 +1,14 @@
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.12.4)
 
 project(rpcs3)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8)
-		message(FATAL_ERROR "RPCS3 requires at least gcc-8.")
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
+		message(FATAL_ERROR "RPCS3 requires at least gcc-9.")
 	endif()
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
-		message(FATAL_ERROR "RPCS3 requires at least clang-5.0.")
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+		message(FATAL_ERROR "RPCS3 requires at least clang-10.0.")
 	endif()
 endif()
 
@@ -22,14 +22,11 @@ option(USE_LIBEVDEV "libevdev-based joystick support" ON)
 option(USE_DISCORD_RPC "Discord rich presence integration" ON)
 option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON)
 option(USE_VULKAN "Vulkan render backend" ON)
+option(USE_COTIRE "Use precompiled headers" ON)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/rpcs3/cmake_modules")
 
-if (MSVC)
-	set(CMAKE_CXX_STANDARD 20)
-else()
-	set(CMAKE_CXX_STANDARD 17)
-endif()
+set(CMAKE_CXX_STANDARD 20)
 include(CheckCXXCompilerFlag)
 
 if (NOT CMAKE_BUILD_TYPE)

Utilities/geometry.h

@@ -101,15 +101,18 @@ struct size2_base
 		return *this;
 	}
 
-	constexpr bool operator == (const size2_base& rhs) const
+	constexpr bool operator ==(const size2_base& rhs) const
 	{
 		return width == rhs.width && height == rhs.height;
 	}
 
-	constexpr bool operator != (const size2_base& rhs) const
+#if __cpp_impl_three_way_comparison >= 201711
+#else
+	constexpr bool operator !=(const size2_base& rhs) const
 	{
 		return width != rhs.width || height != rhs.height;
 	}
+#endif
 
 	template<typename NT>
 	constexpr operator size2_base<NT>() const
@@ -644,10 +647,13 @@ struct coord_base
 		return position == rhs.position && size == rhs.size;
 	}
 
+#if __cpp_impl_three_way_comparison >= 201711
+#else
 	constexpr bool operator != (const coord_base& rhs) const
 	{
 		return position != rhs.position || size != rhs.size;
 	}
+#endif
 
 	template<typename NT>
 	constexpr operator coord_base<NT>() const
@@ -876,11 +882,13 @@ struct color4_base
 	{
 		return r == rhs.r && g == rhs.g && b == rhs.b && a == rhs.a;
 	}
-
+#if __cpp_impl_three_way_comparison >= 201711
+#else
 	constexpr bool operator != (const color4_base& rhs) const
 	{
 		return !(*this == rhs);
 	}
+#endif
 
 	void operator *= (const color4_base<T>& rhs)
 	{
@@ -950,11 +958,13 @@ struct color3_base
 	{
 		return r == rhs.r && g == rhs.g && b == rhs.b;
 	}
-
+#if __cpp_impl_three_way_comparison >= 201711
+#else
 	constexpr bool operator != (const color3_base& rhs) const
 	{
 		return !(*this == rhs);
 	}
+#endif
 
 	template<typename NT>
 	constexpr operator color3_base<NT>() const
@@ -993,10 +1003,13 @@ struct color2_base
 		return r == rhs.r && g == rhs.g;
 	}
 
+#if __cpp_impl_three_way_comparison >= 201711
+#else
 	constexpr bool operator != (const color2_base& rhs) const
 	{
 		return !(*this == rhs);
 	}
+#endif
 
 	template<typename NT>
 	constexpr operator color2_base<NT>() const
@@ -1024,10 +1037,13 @@ struct color1_base
 		return r == rhs.r;
 	}
 
+#if __cpp_impl_three_way_comparison >= 201711
+#else
 	constexpr bool operator != (const color1_base& rhs) const
 	{
 		return !(*this == rhs);
 	}
+#endif
 
 	template<typename NT>
 	constexpr operator color1_base<NT>() const

rpcs3/CMakeLists.txt

@@ -110,11 +110,13 @@ else()
 	target_link_libraries(rpcs3 ${CMAKE_DL_LIBS})
 endif()
 
-set_target_properties(rpcs3 PROPERTIES
-	COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
-	COTIRE_ADD_UNITY_BUILD OFF)
+if(USE_COTIRE)
+	set_target_properties(rpcs3 PROPERTIES
+		COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+		COTIRE_ADD_UNITY_BUILD OFF)
 
-cotire(rpcs3)
+	cotire(rpcs3)
+endif()
 
 # Copy icons to executable directory
 if(APPLE)

rpcs3/Emu/CMakeLists.txt

@@ -431,11 +431,13 @@ target_link_libraries(rpcs3_emu
 )
 
 
-# Setup cotire
-option(UNITY_BUILD_EMU "Use unity build for rpcs3_emu target" OFF)
+if (USE_COTIRE)
+	# Setup cotire
+	option(UNITY_BUILD_EMU "Use unity build for rpcs3_emu target" OFF)
 
-set_target_properties(rpcs3_emu PROPERTIES
-	COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
-	COTIRE_ADD_UNITY_BUILD ${UNITY_BUILD_EMU})
+	set_target_properties(rpcs3_emu PROPERTIES
+		COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+		COTIRE_ADD_UNITY_BUILD ${UNITY_BUILD_EMU})
 
-cotire(rpcs3_emu)
+	cotire(rpcs3_emu)
+endif()