From 9212ed4263e2e147a39cde37d4fd372bf146ef01 Mon Sep 17 00:00:00 2001 From: Tobias Frost Date: Fri, 19 Jun 2015 16:09:30 +0200 Subject: [PATCH] Propagate USE_INTRINSICS through CMake --- neo/CMakeLists.txt | 5 +++++ neo/idlib/sys/sys_intrinsics.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index b6662492..92ca88e8 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -40,6 +40,8 @@ set(CPU_TYPE "" CACHE STRING "When set, passes this string as CPU-ID which will set(CPU_OPTIMIZATION "-mmmx -msse -msse2" CACHE STRING "Which CPU specific optimitations should be used beside the compiler's default?") +option(USE_INTRINSICS "Compile using intrinsics (e.g mmx, sse, msse2)" ON) + if(UNIX) set(OPENAL TRUE) endif() @@ -71,6 +73,9 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") if (CPU_OPTIMIZATION) add_definitions(${CPU_OPTIMIZATION}) endif() + if (USE_INTRINSICS) + add_definitions(-DUSE_INTRINSICS) + endif() if(WIN32) # require msvcr70.dll or newer for _aligned_malloc etc # I think it is from Visual C++ .NET 2002, so it should be available on any remotely modern system. diff --git a/neo/idlib/sys/sys_intrinsics.h b/neo/idlib/sys/sys_intrinsics.h index 64a387a3..eab03980 100644 --- a/neo/idlib/sys/sys_intrinsics.h +++ b/neo/idlib/sys/sys_intrinsics.h @@ -29,11 +29,6 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SYS_INTRIINSICS_H__ #define __SYS_INTRIINSICS_H__ -#if defined(__x86_64__) -// Enable this only on amd64 -#define USE_INTRINSICS -#endif - #if defined(USE_INTRINSICS) #include #endif