Author: loonycyborg
Date: Sat Oct 4 16:19:57 2008
New Revision: 29864
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29864&view=rev
Log:
Readded the option to disable built-in editor to scons script.
Modified:
trunk/SConstruct
trunk/src/SConscript
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=29864&r1=29863&r2=29864&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sat Oct 4 16:19:57 2008
@@ -59,6 +59,7 @@
PathOption('mandir', 'sets the man pages directory to a non-default
location', "$datarootdir/man", PathOption.PathAccept),
PathOption('docdir', 'sets the doc directory to a non-default location',
"$datarootdir/doc/wesnoth", PathOption.PathAccept),
PathOption('python_site_packages_dir', 'sets the directory where python
modules are installed', "lib/python/site-packages/wesnoth",
PathOption.PathAccept),
+ BoolOption('editor', 'Enable editor', True),
BoolOption('lowmem', 'Set to reduce memory usage by removing extra
functionality', False),
BoolOption('nls','enable compile/install of gettext message
catalogs',True),
PathOption('prefix', 'autotools-style installation prefix', "/usr/local",
PathOption.PathAccept),
@@ -292,6 +293,9 @@
if env['internal_data']:
env.Append(CPPDEFINES = "USE_INTERNAL_DATA")
+if not env["editor"]:
+ env.Append(CPPDEFINES = "DISABLE_EDITOR2")
+
if have_X:
env.Append(CPPDEFINES = "_X11")
Modified: trunk/src/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConscript?rev=29864&r1=29863&r2=29864&view=diff
==============================================================================
--- trunk/src/SConscript (original)
+++ trunk/src/SConscript Sat Oct 4 16:19:57 2008
@@ -272,7 +272,8 @@
editor2/mouse_action.cpp
""")
-wesnoth_sources += wesnoth_editor2_sources
+if env["editor"]:
+ wesnoth_sources += wesnoth_editor2_sources
libwesnoth_extras = env.Library("wesnoth_extras", wesnoth_sources)
#
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
