tschwery/alock
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fixes to scons

Browse source 
--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4076
This commit is contained in:
mathias.gumz 2008-06-24 06:51:32 +00:00
parent 678030f925
commit 0482eac2df
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -1,6 +1,7 @@
Version 1.0 Version 1.0
---------------------------------------------------------------------- ----------------------------------------------------------------------
2008-06-24: 2008-06-24:
* minor fixes to scons
* minor docu issues * minor docu issues
* (f)printf formatstring issues fixed * (f)printf formatstring issues fixed

10
SConstruct
View file

@ -152,23 +152,23 @@ if alock_env['imlib2']:
else: else:
imlib2_env = Environment() imlib2_env = Environment()
imlib2_env.ParseConfig('imlib2-config --cflags --libs') imlib2_env.ParseConfig('imlib2-config --cflags --libs')
if not imlib2_env.Dictionary()['LIBS']: if not imlib2_env.Dictionary().get('LIBS'):
print "missing imlib2, install it." print "missing imlib2, install it."
alock_env['imlib2'] = 0 alock_env['imlib2'] = 0
else: else:
print "yes" print "yes"
alock_env.AppendUnique( alock_env.AppendUnique(
CPPDEFINES = [ 'HAVE_IMLIB2' ], CPPDEFINES = [ 'HAVE_IMLIB2' ],
LIBPATH = imlib2_env.Dictionary()['LIBPATH'], LIBPATH = imlib2_env.Dictionary().get('LIBPATH'),
CPPPATH = imlib2_env.Dictionary()['CPPPATH'], CPPPATH = imlib2_env.Dictionary().get('CPPPATH'),
LIBS = imlib2_env.Dictionary()['LIBS'] LIBS = imlib2_env.Dictionary().get('LIBS')
) )
conf.Finish() conf.Finish()
if alock_env['xrender']: if alock_env['xrender']:
conf = alock_env.Configure() conf = alock_env.Configure()
if conf.CheckLib('Xrender', 'XRenderCreatePicture', 1): if conf.CheckLib('libXrender'):
alock_env.AppendUnique( alock_env.AppendUnique(
CPPDEFINES = [ 'HAVE_XRENDER' ], CPPDEFINES = [ 'HAVE_XRENDER' ],
LIBS = [ 'Xrender' ] LIBS = [ 'Xrender' ]

2
src/SConscript
View file

@ -13,7 +13,7 @@ cursor_sources = [ 'cursor_none.c', 'cursor_theme.c', 'cursor_glyph.c' ]
Import('alock_env') Import('alock_env')
build = alock_env.Copy() build = alock_env.Clone()
if build['passwd']: if build['passwd']: