Merge branch 'master' into clientserver

ZDoom · Jun 4, 2020 · f09fe7b · f09fe7b
2 parents 0089a73 + 9bf0f9b
commit f09fe7b
Show file tree

Hide file tree

Showing 547 changed files with 11,199 additions and 9,705 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -156,6 +156,7 @@ macro( use_fast_math )
 	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ZD_FASTMATH_FLAG}" )
 endmacro()
 
+
 include( CheckFunctionExists )
 
 macro( require_stricmp )
@@ -203,9 +204,9 @@ if( MSVC )
 	# Function-level linking
 	# Disable run-time type information
 	if ( HAVE_VULKAN )
-		set( ALL_C_FLAGS "/GF /Gy /permissive- /DHAVE_VULKAN" )
+		set( ALL_C_FLAGS "/GF /Gy /permissive- /DHAVE_VULKAN /DHAVE_SOFTPOLY" )
 	else()
-		set( ALL_C_FLAGS "/GF /Gy /permissive-" )
+		set( ALL_C_FLAGS "/GF /Gy /permissive- /DHAVE_SOFTPOLY" )
 	endif()
 
 	# Use SSE 2 as minimum always as the true color drawers needs it for __vectorcall
@@ -241,9 +242,9 @@ if( MSVC )
 else()
 	set( REL_LINKER_FLAGS "" )
 	if ( HAVE_VULKAN )
-		set( ALL_C_FLAGS "-ffp-contract=off -DHAVE_VULKAN" )
+		set( ALL_C_FLAGS "-ffp-contract=off -DHAVE_VULKAN -DHAVE_SOFTPOLY" )
 	else()
-		set( ALL_C_FLAGS "-ffp-contract=off" )
+		set( ALL_C_FLAGS "-ffp-contract=off -DHAVE_SOFTPOLY" )
 	endif()
 
 	if ( UNIX )