Author: ilor
Date: Fri Aug 15 20:11:11 2008
New Revision: 28607
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28607&view=rev
Log:
Make editor2 options on by default in the build systems
Modified:
trunk/CMakeLists.txt
trunk/SConstruct
trunk/configure.ac
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=28607&r1=28606&r2=28607&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Fri Aug 15 20:11:11 2008
@@ -68,7 +68,7 @@
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)
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=28607&r1=28606&r2=28607&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Fri Aug 15 20:11:11 2008
@@ -47,7 +47,7 @@
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),
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=28607&r1=28606&r2=28607&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Aug 15 20:11:11 2008
@@ -240,9 +240,9 @@
[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]),
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
