diff options
author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /mesalib/src/SConscript | |
parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'mesalib/src/SConscript')
-rw-r--r-- | mesalib/src/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/SConscript b/mesalib/src/SConscript index 87e244403..1eee8761a 100644 --- a/mesalib/src/SConscript +++ b/mesalib/src/SConscript @@ -21,7 +21,7 @@ SConscript('mesa/SConscript') SConscript('mapi/vgapi/SConscript') -if env['platform'] != 'embedded': +if not env['embedded']: SConscript('glx/SConscript') SConscript('egl/main/SConscript') SConscript('glu/sgi/SConscript') |