Author: esr
Date: Mon Mar 24 05:20:35 2008
New Revision: 25047
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25047&view=rev
Log:
Implement the prefsdir option.
Modified:
trunk/SConstruct
trunk/src/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25047&r1=25046&r2=25047&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Mar 24 05:20:35 2008
@@ -20,7 +20,6 @@
opts = Options()
opts.Add(PathOption('prefix', 'autotools-style installation prefix',
"/usr/local"))
opts.Add(PathOption('datadir', 'read-only architecture-independent game data',
"wesnoth", PathOption.PathAccept))
-opts.Add(PathOption('prefsdir', 'user preferences directory', ".wesnoth",
PathOption.PathAccept))
opts.Add(BoolOption('lite', 'Set to build lite version of wesnoth (no music or
large images)', False))
opts.Add(BoolOption('dummy_locales','Set to enable Wesnoth private locales',
False))
opts.Add(PathOption('fifodir', 'directory for the wesnothd fifo socket file',
"/var/run/wesnothd", PathOption.PathAccept))
@@ -42,6 +41,7 @@
opts.Add(BoolOption('tinygui', 'Set for GUI reductions for resolutions down to
320x240 (PDAs), resize images before installing', False))
opts.Add(BoolOption('lowmem', 'Set to reduce memory usage by removing extra
functionality', False))
opts.Add(BoolOption('fribidi','Clear to disable bidirectional-language
support', True))
+opts.Add(PathOption('prefsdir', 'user preferences directory', ".wesnoth",
PathOption.PathAccept))
#
# Setup
Modified: trunk/src/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConstruct?rev=25047&r1=25046&r2=25047&view=diff
==============================================================================
--- trunk/src/SConstruct (original)
+++ trunk/src/SConstruct Mon Mar 24 05:20:35 2008
@@ -40,6 +40,9 @@
if env['raw_sockets']:
env["CXXFLAGS"].append("-DNETWORK_USE_RAW_SOCKETS")
+
+if env['prefsdir']:
+ env["CXXFLAGS"].append("-DPREFERENCES_DIR='%s'" % env['prefsdir'])
cc_version = env["CCVERSION"]
if env["CC"] == "gcc":
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
