0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable the new pool allocated by default.

Browse source 
The new allocator seems to give some problems on some systems so disable
by default. The changes haven't been tested on scons and cmake.
This commit is contained in:
Mark de Wever 2008-12-30 21:03:11 +00:00
parent 5d8e98bbed
commit d8262df9c5
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -79,7 +79,7 @@ option(ENABLE_EDITOR "Enable compilation of the new map editor into the game exe
option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
option(ENABLE_TESTS "Build unit tests")
option(ENABLE_NLS "Enable building of tranlations" ON)
option(ENABLE_POOL_ALLOC "Enable custom pool malloc" ON)
option(ENABLE_POOL_ALLOC "Enable custom pool malloc" OFF)
set(BINARY_SUFFIX "" CACHE STRING "Suffix behind all binaries")
set(BINARY_PREFIX "" CACHE STRING "Prefix in front of all binaries")

2
SConstruct
View file

@ -71,7 +71,7 @@ opts.AddOptions(
BoolOption('python', 'Enable in-game python extensions.', True),
BoolOption('raw_sockets', 'Set to use raw receiving sockets in the multiplayer network layer rather than the SDL_net facilities', False),
BoolOption('forum_user_handler', 'Enable forum user handler in wesnothd', False),
BoolOption('pool_alloc', 'Enable custom pool malloc', True),
BoolOption('pool_alloc', 'Enable custom pool malloc', False),
('server_gid', 'group id of the user who runs wesnothd', ""),
('server_uid', 'user id of the user who runs wesnothd', ""),
EnumOption('gui', 'Set for GUI reductions for resolutions down to 320x240 (PDAs)', "normal", ["normal", "tiny"]),

2
changelog
View file

@ -144,7 +144,7 @@ Version 1.5.7:
* Fixed the restart-replay button causing an assertion failure.
* New memory allocator introduced to the engine. It should
produce 5-10% savings in memory usage on 64-bit systems.
The allocator can be disabled with all build systems.
The allocator is disabled by default.
* Included extra headers for certain g++ versions (patch #1113).
* Fixed random memory corruption/assertion failure/massive leak due
to story screens.

4
configure.ac
View file

@ -266,9 +266,9 @@ AC_ARG_ENABLE([dummy-locales],
[dummylocales=no])
AC_ARG_ENABLE([pool-alloc],
AS_HELP_STRING([--disable-pool-alloc], [disable the pool allocator]),
AS_HELP_STRING([--enable-pool-alloc], [enable the pool allocator]),
[poolalloc=$enableval],
[poolalloc=yes])
[poolalloc=no])
AC_ARG_WITH([preferences-dir],
AS_HELP_STRING([--with-preferences-dir], [use a non-default preferences directory (.wesnoth on unix)]),