upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 21:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make editor2 options on by default in the build systems

Browse Source
This commit is contained in:
Tomasz Śniatowski 2008-08-15 19:11:11 +01:00
parent 54b01e90a6
commit c19943c2ba
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -68,7 +68,7 @@ option(ENABLE_GAME "Enable compilation of the game" ON)
option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
option(ENABLE_SERVER "Enable compilation of server" ON)
option(ENABLE_EDITOR "Enable compilation of map editor")
option(ENABLE_EDITOR2 "Enable compilation of the new map editor into the game (EXPERIMENTAL)")
option(ENABLE_EDITOR2 "Enable compilation of the new map editor into the game executable" ON)
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)

2
SConstruct
View File

@ -47,7 +47,7 @@ opts.AddOptions(
PathOption('datarootdir', 'sets the root of data directories to a non-default location', "share", PathOption.PathAccept),
PathOption('datadirname', 'sets the name of data directory', "wesnoth$version_suffix", PathOption.PathAccept),
PathOption('desktopdir', 'sets the desktop entry directory to a non-default location', "$datarootdir/applications", PathOption.PathAccept),
BoolOption('editor2', 'set to build the new map editor in the "wesnoth" target (EXPERIMENTAL)', False),
BoolOption('editor2', 'set to build the new map editor in the "wesnoth" target (inside the game)', True),
PathOption('icondir', 'sets the icons directory to a non-default location', "$datarootdir/icons", PathOption.PathAccept),
BoolOption('internal_data', 'Set to put data in Mac OS X application fork', False),
PathOption('localedirname', 'sets the locale data directory to a non-default location', "translations", PathOption.PathAccept),

4
configure.ac
View File

@ -240,9 +240,9 @@ AC_ARG_ENABLE([editor],
[editor=no])
AC_ARG_ENABLE([editor2],
AS_HELP_STRING([--enable-editor2], [build the new map editor in the game (EXPERIMENTAL)]),
AS_HELP_STRING([--enable-editor2], [build the new map editor in the game executable]),
[editor2=$enableval],
[editor2=no])
[editor2=yes])
AC_ARG_ENABLE([tools],
AS_HELP_STRING([--enable-tools], [enable building and installation of tools for artists and WML maintainers]),