Author: loonycyborg
Date: Thu May 1 12:34:25 2008
New Revision: 26275
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26275&view=rev
Log:
Use pkg-config to check for SDL.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=26275&r1=26274&r2=26275&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Thu May 1 12:34:25 2008
@@ -296,7 +296,7 @@
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("sdl-config --cflags --libs")
+ env.ParseConfig("pkg-config --cflags --libs sdl")
if env["PLATFORM"] == "win32":
env.AppendUnique(CCFLAGS = ["-D_GNU_SOURCE"])
env.AppendUnique(LIBS = Split("mingw32 SDLmain SDL"))
@@ -401,12 +401,10 @@
'CheckPNG' : CheckPNG,
'CheckBoost' : CheckBoost })
-#if env["prereqs"]:
-# conf.CheckPKGConfig('0.15.0') or Die("Base prerequisites are not met.")
-
if env["prereqs"]:
conf.CheckCPlusPlus(gcc_version = "3.3") and \
conf.CheckBoost("iostreams", require_version = "1.33.0") and \
+ conf.CheckPKGConfig('0.15.0') and \
conf.CheckSDL(require_version = '1.2.7') or Die("Base prerequisites are
not met.")
have_client_prereqs = \
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
