diff options
| author | Zack Rusin <zackr@vmware.com> | 2010-03-31 22:16:09 -0400 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2010-03-31 22:16:09 -0400 |
| commit | b6d052e4fd83d923776320cf5fef66abcd4bf3d0 (patch) | |
| tree | f68676e2c833965424ea82ef466ce83f8be25310 /SConstruct | |
| parent | ae5487d4276007e466b6a7c783d6fb740f9539c5 (diff) | |
| parent | 2fb655d1dbb3f8425aeff1597271262661ef206b (diff) | |
Merge remote branch 'origin/master' into gallium_draw_llvm
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/SConstruct b/SConstruct index 5d44b6efde..d9230bd904 100644 --- a/SConstruct +++ b/SConstruct @@ -159,12 +159,9 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'): ]) if platform == 'darwin': env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE']) - env.Append(CPPPATH = ['/usr/X11R6/include']) - env.Append(LIBPATH = ['/usr/X11R6/lib']) env.Append(LIBS = [ 'm', 'pthread', - 'expat', 'dl', ]) @@ -182,16 +179,6 @@ if dri: if drawllvm: env.Append(CPPDEFINES = ['DRAW_LLVM']) -# libGL -if platform in ('linux', 'freebsd', 'darwin'): - env.Append(LIBS = [ - 'X11', - 'Xext', - 'Xxf86vm', - 'Xdamage', - 'Xfixes', - ]) - # for debugging #print env.Dump() |