Author: loonycyborg
Date: Wed Oct 15 12:00:27 2008
New Revision: 30184
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30184&view=rev
Log:
Made boost autodetection look for boost in /sw, /sw/local and C:\Boost.
Modified:
trunk/scons/boost.py
trunk/scons/config_check_utils.py
Modified: trunk/scons/boost.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/boost.py?rev=30184&r1=30183&r2=30184&view=diff
==============================================================================
--- trunk/scons/boost.py (original)
+++ trunk/scons/boost.py Wed Oct 15 12:00:27 2008
@@ -5,7 +5,7 @@
import re
def find_boost(env):
- prefixes = [env["prefix"]]
+ prefixes = [env["prefix"], "C:\\Boost"]
include = find_include(prefixes, "boost/config.hpp", "", not env["host"])
if include:
prefix, includefile = include[0]
Modified: trunk/scons/config_check_utils.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/config_check_utils.py?rev=30184&r1=30183&r2=30184&view=diff
==============================================================================
--- trunk/scons/config_check_utils.py (original)
+++ trunk/scons/config_check_utils.py Wed Oct 15 12:00:27 2008
@@ -14,5 +14,5 @@
def find_include(prefixes, include_file, include_subdir, default_prefixes =
True):
if default_prefixes:
- prefixes = ["/usr", "/usr/local"] + prefixes
+ prefixes = ["/usr", "/usr/local", "/sw", "/sw/local"] + prefixes
return [(prefix, include) for prefix in prefixes for include in
glob(join(prefix, "include", include_subdir, include_file))]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
