Author: loonycyborg
Date: Thu May 1 13:07:14 2008
New Revision: 26276
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26276&view=rev
Log:
Made sdl check more robust.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=26276&r1=26275&r2=26276&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Thu May 1 13:07:14 2008
@@ -296,7 +296,9 @@
if sdldir:
env.AppendUnique(CPPPATH = [os.path.join(sdldir, "include/SDL")],
LIBPATH = [os.path.join(sdldir, "lib")])
if env["PLATFORM"] == "posix" or env["PLATFORM"] == "darwin":
- env.ParseConfig("pkg-config --cflags --libs sdl")
+ result, output = context.TryAction("pkg-config --cflags --libs sdl
> $TARGET")
+ if result == 1:
+ env.MergeFlags(output)
if env["PLATFORM"] == "win32":
env.AppendUnique(CCFLAGS = ["-D_GNU_SOURCE"])
env.AppendUnique(LIBS = Split("mingw32 SDLmain SDL"))
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
