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


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

Header


Content

Posted by loonycyborg on March 29, 2008 - 16:19:
Author: loonycyborg
Date: Sat Mar 29 16:19:52 2008
New Revision: 25291

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25291&view=rev
Log:
Made scons recipe disable in-game python extensions if python is not found 
instead of disabling "wesnoth" target.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25291&r1=25290&r2=25291&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sat Mar 29 16:19:52 2008
@@ -320,7 +320,8 @@
 
     have_server_prereqs = conf.CheckSDL('SDL_net') or Warning("Server 
prerequisites are not met. wesnothd and campaignd cannot be built.")
 
-    have_python = (float(sys.version[:3]) >= 2.4) and 
conf.CheckLib('python'+sys.version[:3]) or Warning("Python >= 2.4 not found. 
The game cannot be built.")
+    if env["python"]:
+        env["python"] = (float(sys.version[:3]) >= 2.4) and 
conf.CheckLib('python'+sys.version[:3]) or Warning("Python >= 2.4 not found. 
Python extensions will be disabled.")
 else:
     have_client_prereqs = True
     have_python = True
@@ -617,7 +618,7 @@
 # Target declarations
 #
 
-if have_client_prereqs and have_python:
+if have_client_prereqs:
     wesnoth = env.Program("wesnoth", ["src/game.cpp"] + wesnoth_sources,
             CPPPATH = commonpath + ['src/server'],
             LIBS = ['wesnoth_core', 'wesnoth_sdl', 'wesnoth', 'campaignd'] + 
commonlibs + extralibs,




Related Messages


Powered by MHonArc, Updated Sat Mar 29 16:42:29 2008