Author: loonycyborg
Date: Sun Apr 27 13:45:12 2008
New Revision: 26169
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26169&view=rev
Log:
SDL check no longer appends unneeded paths to CPPPATH and LIBPATH.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=26169&r1=26168&r2=26169&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sun Apr 27 13:45:12 2008
@@ -222,14 +222,15 @@
backup = backup_env(context.env, ["CPPPATH", "LIBPATH", "LIBS"])
- sdldir = context.env.get("SDLDIR", "/usr/")
+ sdldir = context.env.get("SDLDIR", "")
if sdl_lib == "SDL":
if require_version:
context.Message("Checking for Simple DirectMedia Layer library
version >= %d.%d.%d... " % (major_version, minor_version, patchlevel))
else:
context.Message("Checking for Simple DirectMedia Layer library...
")
env = context.env
- env.AppendUnique(CPPPATH = [os.path.join(sdldir, "include/SDL")],
LIBPATH = [os.path.join(sdldir, "lib")])
+ 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")
if env["PLATFORM"] == "win32":
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
