diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
| commit | b821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch) | |
| tree | 7b3c0b22d35eadf598cff3965413a96c76d5ad39 /mesalib/src/gallium | |
| parent | 56e12b1310b1b52d00bc27e919d915255af5bf03 (diff) | |
| parent | b8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff) | |
| download | vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2 vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman git update 18 okt 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
Diffstat (limited to 'mesalib/src/gallium')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/SConscript | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/SConscript b/mesalib/src/gallium/auxiliary/SConscript index 3ac311225..31dfed316 100644 --- a/mesalib/src/gallium/auxiliary/SConscript +++ b/mesalib/src/gallium/auxiliary/SConscript @@ -46,8 +46,6 @@ source = env.ParseSourceList('Makefile.sources', [ ]) if env['llvm']: - env.Append(CXXFLAGS = env['LLVM_CXXFLAGS']) - source += env.ParseSourceList('Makefile.sources', [ 'GALLIVM_SOURCES', 'GALLIVM_CPP_SOURCES' |