Permalink
Browse files

Core: Remove the MersenneTwiser-library (SFMT is now considered stabl…

…e enough for full deployment)
  • Loading branch information...
1 parent a92820b commit 6afaed4a02ff5e29510a9e1afffea803e02f3d69 @click click committed Mar 27, 2012
@@ -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)
@@ -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 )
@@ -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)
View
@@ -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)
View
@@ -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("")
View
@@ -20,10 +20,6 @@ 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)
Oops, something went wrong.

4 comments on commit 6afaed4

what would happend if "USE SFMT" was left un-checked in CMake?
Thank you for your time and sorry for the nooby question.

Member

DDuarte replied Mar 27, 2012

@delro92, I don't know "cmake language" but judging by this line 6afaed4#L3L16 that option was removed.

@DDuarte thanks for pointing that out, it made me realise why I still had the option for SFMT
The problem was that I had a cache-ed version. Simply deleting CMake's cache and setting it up once again solved the problem.

Member

click replied Mar 27, 2012

@delro92: Removing a compileflag doesn't necessarily need clearing CMakes' cache, since the parameter just becomes unused.
But as you said, just rerun CMake and it'll disappear from the GUI as well.

Please sign in to comment.