0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch off abort checks for missing library...

Browse source 
...if user specified CXXFLAGS or LDFLAGS.  (Assume he knows what he's
doing.)
This commit is contained in:
Eric S. Raymond 2008-03-28 17:37:44 +00:00
parent 5d28c25057
commit 0f44d50eef
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
SConstruct
View file

@ -68,6 +68,9 @@ The following special build targets
sanity-check = run a pre-release sanity check on the distribution.
manual.en.html = HTML version of the English-language manual.
If you set CXXFLAGS and/or LDFLAGS in the environmnt, the values will
be appended to the appropriate variables withn scons. You can use this,
for example, to point scons at non-default library locations.
""" + opts.GenerateHelpText(env))
# Omits the 'test' target
@ -276,25 +279,27 @@ if not conf.CheckBoost("iostreams"):
print 'boost_iostreams not found.'
Exit(1)
targets = sets.Set(COMMAND_LINE_TARGETS)
if not targets or (sets.Set(['all', 'wesnoth', 'wesnoth_editor']) & targets):
if not conf.CheckSDL(require_version = '1.2.7'):
print 'SDL >= 1.2.7 not found!'
Exit(1)
if not conf.CheckSDL("SDL_ttf", require_version = "2.0.8"):
print 'SDL_ttf >= 2.0.8 not found!'
Exit(1)
if not conf.CheckSDL("SDL_mixer"):
print "SDL mixer not found!"
if not conf.CheckSDL('SDL_image'):
print "Needed SDL image library, not found!"
Exit(1)
if not conf.CheckOgg():
print "No Ogg Vorbis support in SDL!"
Exit(1)
if not conf.CheckPNG():
print "No PNG support in SDL!"
Exit(1)
# If user specified library locations, assume he knows what he's doing.
if not 'CXXFLAGS' in os.environ and not 'LDFLAGS' in os.environ:
targets = sets.Set(COMMAND_LINE_TARGETS)
if not targets or (sets.Set(['all','wesnoth','wesnoth_editor']) & targets):
if not conf.CheckSDL(require_version = '1.2.7'):
print 'SDL >= 1.2.7 not found!'
Exit(1)
if not conf.CheckSDL("SDL_ttf", require_version = "2.0.8"):
print 'SDL_ttf >= 2.0.8 not found!'
Exit(1)
if not conf.CheckSDL("SDL_mixer"):
print "SDL mixer not found!"
if not conf.CheckSDL('SDL_image'):
print "Needed SDL image library, not found!"
Exit(1)
if not conf.CheckOgg():
print "No Ogg Vorbis support in SDL!"
Exit(1)
if not conf.CheckPNG():
print "No PNG support in SDL!"
Exit(1)
#
# Check some other preconditions