Author: ilor
Date: Sun Jul 20 22:53:08 2008
New Revision: 28112
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28112&view=rev
Log:
The old editor now build fine with editor2 option set, so remove warnings and
checks for that
Modified:
trunk/CMakeLists.txt
trunk/SConstruct
trunk/configure.ac
trunk/src/SConscript
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=28112&r1=28111&r2=28112&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Sun Jul 20 22:53:08 2008
@@ -67,8 +67,8 @@
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 (only either EDITOR or
EDITOR2 do currently work, not both at the same time!)")
-option(ENABLE_EDITOR2 "Enable compilation of the new map editor into the game
(EXPERIMENTAL, only either EDITOR or EDITOR2 do currently work, not both at the
same time!)")
+option(ENABLE_EDITOR "Enable compilation of map editor")
+option(ENABLE_EDITOR2 "Enable compilation of the new map editor into the game
(EXPERIMENTAL)")
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=28112&r1=28111&r2=28112&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sun Jul 20 22:53:08 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, do not use with wesnoth_editor)', False),
+ BoolOption('editor2', 'set to build the new map editor in the "wesnoth"
target (EXPERIMENTAL)', False),
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=28112&r1=28111&r2=28112&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Jul 20 22:53:08 2008
@@ -240,7 +240,7 @@
[editor=no])
AC_ARG_ENABLE([editor2],
- AS_HELP_STRING([--enable-editor2], [build the new map editor in
the game (EXPERIMENTAL, do not use along --enable-editor)]),
+ AS_HELP_STRING([--enable-editor2], [build the new map editor in
the game (EXPERIMENTAL)]),
[editor2=$enableval],
[editor2=no])
Modified: trunk/src/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConscript?rev=28112&r1=28111&r2=28112&view=diff
==============================================================================
--- trunk/src/SConscript (original)
+++ trunk/src/SConscript Sun Jul 20 22:53:08 2008
@@ -287,7 +287,7 @@
editor/editor_undo.cpp
animated_editor.cpp
""")
-env.WesnothProgram("wesnoth_editor", wesnoth_editor_sources +
[libwesnoth_core, libwesnoth_sdl, libwesnoth] + wesnoth_editor_res,
have_client_prereqs and not env["editor2"])
+env.WesnothProgram("wesnoth_editor", wesnoth_editor_sources +
[libwesnoth_core, libwesnoth_sdl, libwesnoth] + wesnoth_editor_res,
have_client_prereqs)
campaignd_sources = Split("""
server/input_stream.cpp
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
