mail[Wesnoth-commits] r25249 - /trunk/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 28, 2008 - 17:18:
Author: esr
Date: Fri Mar 28 17:18:38 2008
New Revision: 25249

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25249&view=rev
Log:
Integrate loonycyborg's boost checks better.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25249&r1=25248&r2=25249&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Fri Mar 28 17:18:38 2008
@@ -99,14 +99,16 @@
 
 def CheckBoostLib(context, boost_lib, require_version = None):
     env = context.env
+    boostdir = context.env.get("BOOSTDIR",
+                               os.path.join(context.env["prefix"], "boost"))
     backup = backup_env(env, ["CPPPATH", "LIBPATH", "LIBS"])
-    env.AppendUnique(CPPPATH = [env["BOOSTDIR"]], LIBPATH = 
[env["BOOSTLIBS"]])
+    env.AppendUnique(CPPPATH = [boostdir], LIBPATH = [env["BOOSTLIBS"]])
 
     boost_headers = { "regex" : "regex/config.hpp" }
     header_name = boost_headers.get(boost_lib, boost_lib + ".hpp")
     libname = "boost_" + boost_lib + env.get("BOOST_SUFFIX", "")
 
-    env.AppendUnique(CPPPATH = [env["BOOSTDIR"]], LIBPATH = 
[env["BOOSTLIBS"]])
+    env.AppendUnique(CPPPATH = [boostdir], LIBPATH = [env["BOOSTLIBS"]])
     env.AppendUnique(LIBS = [libname])
 
     test_program = """
@@ -166,7 +168,8 @@
         except (ValueError, IndexError):
             patch_level = 0
 
-    sdldir = context.env.get("SDLDIR", context.env["prefix"])
+    sdldir = context.env.get("SDLDIR",
+                             os.path.join(context.env["prefix"], "SDL"))
     if sdl_lib == "SDL": 
         if require_version:
             context.Message("Checking for Simple DirectMedia Layer library 
version >= %d.%d.%d... " % (major_version, minor_version, patchlevel))




Related Messages


Powered by MHonArc, Updated Fri Mar 28 17:41:21 2008