flame-wow · Shutokill · Jun 6, 2012 · Jun 6, 2012 · Jun 7, 2012 · Jun 7, 2012
diff --git 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
@@ -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
@@ -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
@@ -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/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
@@ -1,6 +1,8 @@
 # Package overloads - Linux
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  set(JEMALLOC_LIBRARY "jemalloc")
+  if (NOT NOJEM)
+    set(JEMALLOC_LIBRARY "jemalloc")
+  endif()
 endif()
 
 # set default configuration directory

diff --git 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()
@@ -78,4 +71,10 @@ if( WIN32 )
   endif()
 endif( WIN32 )
 
+if ( NOJEM )
+  message("")
+  message("*** WARNING: jemalloc linking has been disabled!")
+  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("")
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
@@ -15,8 +15,8 @@ elseif( MSVC )
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  if(SERVERS)
-    add_subdirectory(jemalloc)
+  if(SERVERS AND NOT NOJEM)
+    add_subdirectory(jemalloc)  
   endif()
 endif()
 

diff --git a/dep/PackageList.txt b/dep/PackageList.txt
@@ -14,16 +14,12 @@ G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
 
 jemalloc (a general-purpose scalable concurrent malloc-implementation)
   http://www.canonware.com/jemalloc/
-  Version: 2.1.0
+  Version: 2.2.5
 
 libMPQ (a library for reading MPQ files)
   https://libmpq.org/
   Version: 1.0.4
 
-MersenneTwister (a very fast random number generator)
-  http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
-  Version: 0.4.2
-
 MySQL (the world's most popular open source database software)
   http://www.mysql.com/
   Version: 5.5.9 (GA)
@@ -42,4 +38,4 @@ zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
 
 gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
   http://gsoap2.sourceforge.net/
-  Version: 2.8.0
+  Version: 2.8.2