5 files changed, 12 insertions, 28 deletions
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
index 3a2745702c8..8247831fdd8 100644
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@@ -3,14 +3,12 @@ add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 
 add_definitions(-fno-delete-null-pointer-checks)
 
-if( USE_SFMT)
-  if(PLATFORM EQUAL 32)
-    # Required on 32-bit systems to enable SSE2 (standard on x64)
-    add_definitions(-msse2 -mfpmath=sse)
-  endif()
-  add_definitions(-DHAVE_SSE2 -D__SSE2__)
-  message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
+if(PLATFORM EQUAL 32)
+  # Required on 32-bit systems to enable SSE2 (standard on x64)
+  add_definitions(-msse2 -mfpmath=sse)
 endif()
+add_definitions(-DHAVE_SSE2 -D__SSE2__)
+message(STATUS "GCC: SSE2 flags forced")
 
 if( WITH_WARNINGS )
   add_definitions(-Wall -Wfatal-errors -Wextra)
diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake
index 0e614ef97f8..b7e4cb742b3 100644
--- a/cmake/compiler/icc/settings.cmake
+++ b/cmake/compiler/icc/settings.cmake
@@ -1,13 +1,10 @@
 # Set build-directive (used in core to tell which buildtype we used)
 add_definitions(-D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}")
 
-if( USE_SFMT)
-  if(PLATFORM EQUAL 32)
-    add_definitions(-axSSE2)
-  else()
-    add_definitions(-xSSE2)
-  endif()
-  message(STATUS "ICC: SFMT enabled, SSE2 flags forced")
+if(PLATFORM EQUAL 32)
+  add_definitions(-axSSE2)
+else()
+  add_definitions(-xSSE2)
 endif()
 
 if( WITH_WARNINGS )
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
index eb55dc66c50..3d8fe43b6aa 100644
--- a/cmake/compiler/msvc/settings.cmake
+++ b/cmake/compiler/msvc/settings.cmake
@@ -20,11 +20,8 @@ else()
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
   message(STATUS "MSVC: Enabled large address awareness")
 
-  # Test if we need SSE2-support
-  if(USE_SFMT)
-    add_definitions(/arch:SSE2)
-    message(STATUS "MSVC: Enabled SSE2 support")
-  endif()
+  add_definitions(/arch:SSE2)
+  message(STATUS "MSVC: Enabled SSE2 support")
 endif()
 
 # Set build-directive (used in core to tell which buildtype we used)
diff --git a/cmake/options.cmake b/cmake/options.cmake
index 71424cc3776..11ebe6ddd12 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -13,6 +13,5 @@ option(SCRIPTS          "Build core with scripts included"
 option(TOOLS            "Build map/vmap extraction/assembler tools"                   0)
 option(USE_SCRIPTPCH    "Use precompiled headers when compiling scripts"              1)
 option(USE_COREPCH      "Use precompiled headers when compiling servers"              1)
-option(USE_SFMT         "Use SFMT as random numbergenerator"                          1)
 option(WITH_WARNINGS    "Show all warnings during compile"                            0)
 option(WITH_COREDEBUG   "Include additional debug-code in core"                       0)
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake
index 9cac1d82f4a..47ad7b0889b 100644
--- a/cmake/showoptions.cmake
+++ b/cmake/showoptions.cmake
@@ -50,13 +50,6 @@ else()
   message("* Build scripts w/PCH    : No")
 endif()
 
-if( USE_SFMT )
-  message("* Use SFMT for RNG       : Yes")
-  add_definitions(-DUSE_SFMT_FOR_RNG)
-else()
-  message("* Use SFMT for RNG       : No  (default)")
-endif()
-
 if( WITH_WARNINGS )
   message("* Show all warnings      : Yes")
 else()
@@ -84,4 +77,4 @@ if ( NOJEM )
   message("*** Please note that this is for DEBUGGING WITH VALGRIND only!")
   message("*** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!")
 endif()
-  message("")
+message("")