Fixed build

deathkiller · Oct 23, 2024 · 5a69765 · 5a69765
1 parent 33d4f23
commit 5a69765
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Sources/Shared/Core/Logger.h b/Sources/Shared/Core/Logger.h
@@ -51,8 +51,7 @@
 #		include <sys/mman.h>
 #	endif
 
-	// _mm_clflushopt is supported only since Skylake and requires "-mclflushopt" option on GCC/clang, and is undefined on clang-cl
-#	if defined(DEATH_TARGET_X86) && defined(DEATH_TARGET_CLFLUSHOPT) && !defined(DEATH_TARGET_CLANG_CL)
+#	if defined(DEATH_TARGET_X86)
 #		if defined(DEATH_TARGET_MSVC)
 #			include <intrin.h>
 #		else
@@ -447,6 +446,7 @@ namespace Death { namespace Trace {
 			T _lastFlushedReaderPos{0};
 
 #	if defined(DEATH_TARGET_X86) && defined(DEATH_TARGET_CLFLUSHOPT) && !defined(DEATH_TARGET_CLANG_CL)
+			// _mm_clflushopt is supported only since Skylake and requires "-mclflushopt" option on GCC/clang, and is undefined on clang-cl
 			void flushCacheLines(T& last, T offset)
 			{
 				T lastDiff = last - (last & CacheLineMask);

diff --git a/cmake/ncine_compiler_options.cmake b/cmake/ncine_compiler_options.cmake
@@ -191,14 +191,14 @@ else() # GCC and LLVM
 	endif()
 
 	# _mm_clflushopt also requires "-mclflushopt" option on GCC/clang
-	if(CMAKE_OSX_ARCHITECTURES)
-		set(CPU_ARCH "${CMAKE_OSX_ARCHITECTURES}")
-	else()
-		set(CPU_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
-	endif()
-	if ("${CPU_ARCH}" STREQUAL "x86_64")
-		target_compile_options(${NCINE_APP} PRIVATE -mclflushopt)
-	endif()
+	#if(CMAKE_OSX_ARCHITECTURES)
+	#	set(CPU_ARCH "${CMAKE_OSX_ARCHITECTURES}")
+	#else()
+	#	set(CPU_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
+	#endif()
+	#if ("${CPU_ARCH}" STREQUAL "x86_64")
+	#	target_compile_options(${NCINE_APP} PRIVATE -mclflushopt)
+	#endif()
 
 	if(NCINE_WITH_TRACY)
 		target_compile_options(${NCINE_APP} PRIVATE $<$<CONFIG:Release>:-g -fno-omit-frame-pointer>)