diff options
| author | Brian Paul <brianp@vmware.com> | 2010-01-25 14:46:17 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-01-25 14:46:17 -0700 |
| commit | 9b22427911ad27efc1f36faee9462c6082d0417c (patch) | |
| tree | 12e5a6c336e4ca2a71b754120dfcc183f09ae58c /SConstruct | |
| parent | 7e7f8815fbfa21ab2397e673fa19c36603bc7a51 (diff) | |
| parent | 6749310d3f60df70ad8f82db986871ab9496793b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 5f6933eadf..ff06b9b592 100644 --- a/SConstruct +++ b/SConstruct @@ -113,6 +113,8 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'): 'PTHREADS', 'HAVE_POSIX_MEMALIGN', ]) + if platform == 'darwin': + env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE']) env.Append(CPPPATH = ['/usr/X11R6/include']) env.Append(LIBPATH = ['/usr/X11R6/lib']) env.Append(LIBS = [ |