Author: loonycyborg
Date: Sun Jun 29 13:27:56 2008
New Revision: 27580
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27580&view=rev
Log:
Some cross-compile fixes.
Modified:
trunk/scons/boost.py
trunk/scons/config_check_utils.py
trunk/scons/cross_compile.py
Modified: trunk/scons/boost.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/boost.py?rev=27580&r1=27579&r2=27580&view=diff
==============================================================================
--- trunk/scons/boost.py (original)
+++ trunk/scons/boost.py Sun Jun 29 13:27:56 2008
@@ -6,7 +6,7 @@
def find_boost(env):
prefixes = [env["prefix"]]
- include = find_include(prefixes, "boost/config.hpp", "")
+ include = find_include(prefixes, "boost/config.hpp", "", not env["host"])
if include:
prefix, includefile = include[0]
env["boostdir"] = join(prefix, "include")
@@ -33,7 +33,6 @@
env["boostlibdir"] = join(prefix, "lib")
if not env.get("boost_suffix"):
libs = glob(join(prefix, "lib", "libboost_*"))
- print libs
for lib in libs:
try:
env["boost_suffix"] = re.findall(r"libboost_\w*(-.*%d_%d)"
% tuple(version), lib)[0]
Modified: trunk/scons/config_check_utils.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/config_check_utils.py?rev=27580&r1=27579&r2=27580&view=diff
==============================================================================
--- trunk/scons/config_check_utils.py (original)
+++ trunk/scons/config_check_utils.py Sun Jun 29 13:27:56 2008
@@ -12,6 +12,7 @@
for var in backup.keys():
env[var] = backup[var]
-def find_include(prefixes, include_file, include_subdir):
- prefixes.extend(["/usr", "/usr/local"])
+def find_include(prefixes, include_file, include_subdir, default_prefixes =
True):
+ if default_prefixes:
+ prefixes.extend(["/usr", "/usr/local"])
return [(prefix, include) for prefix in prefixes for include in
glob(join(prefix, "include", include_subdir, include_file))]
Modified: trunk/scons/cross_compile.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/cross_compile.py?rev=27580&r1=27579&r2=27580&view=diff
==============================================================================
--- trunk/scons/cross_compile.py (original)
+++ trunk/scons/cross_compile.py Sun Jun 29 13:27:56 2008
@@ -1,7 +1,7 @@
# vi: syntax=python:et:ts=4
def setup_cross_compile(env):
- if env["host"] == "mingw32":
+ if "mingw" in env["host"]:
env["PLATFORM"] = "win32"
env["PROGSUFFIX"] = ".exe"
env.Tool("mingw")
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
