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

The old editor now build fine with editor2 option set, so remove warnings and checks for that

Browse source
This commit is contained in:
Tomasz Śniatowski 2008-07-20 21:53:08 +01:00
parent 27b3c7ccd1
commit 52c634c971
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -67,8 +67,8 @@ set(FIFO_DIR "/var/run/wesnothd" CACHE STRING "Directory for the wesnothd fifo s
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)

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, 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),

2
configure.ac
View file

@ -240,7 +240,7 @@ AC_ARG_ENABLE([editor],
[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])

2
src/SConscript
View file

@ -287,7 +287,7 @@ wesnoth_editor_sources = Split("""
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