diff options
| -rw-r--r-- | .hgignore | 14 | ||||
| -rw-r--r-- | contrib/cleanup/whitespace.sh | 2 | ||||
| -rw-r--r-- | src/server/CMakeLists.txt | 8 |
3 files changed, 9 insertions, 15 deletions
diff --git a/.hgignore b/.hgignore index 3c7f8cf5b64..28429b4571b 100644 --- a/.hgignore +++ b/.hgignore @@ -1,26 +1,12 @@ # use glob syntax. syntax: glob -src/server/shared/revision.h build/ -bin/ .directory *.orig *.rej *~ .git/ -VC90/*/ -win/VC90/*/ -src/tools/bin/*/ -src/tools/map_extractor/VC90/*/ -src/tools/vmap3_assembler/VC90/*/ -src/tools/vmap3_extractor/VC90/*/ -externals/lib/*/ -*.ncb -*.suo -*.*-* # use regexp syntax. syntax: regexp - -^src/shared/server/shared/revision\.h diff --git a/contrib/cleanup/whitespace.sh b/contrib/cleanup/whitespace.sh index 62e92c362c6..e3139d0c2c5 100644 --- a/contrib/cleanup/whitespace.sh +++ b/contrib/cleanup/whitespace.sh @@ -1,2 +1,2 @@ -# Be sure to specify files instead of * when running the script. +#!/bin/bash perl -wpi -e "s/ +$//g" $1 diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 4191d4c011a..d37d2fe80f3 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -8,6 +8,14 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# Enforce compileparameters for corebuilds under GCC +# This to stop a few silly crashes that could have been avoided IF people +# weren't doing some -O3 psychooptimizations etc. + +if(CMAKE_COMPILER_IS_GNUCXX) + add_definitions(-fno-delete-null-pointer-checks) +endif() + if( SERVERS ) add_subdirectory(shared) add_subdirectory(game) |