diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-20 09:41:09 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-20 09:41:09 +0100 |
| commit | c5f912c7b9248440bf9dff4b3c64513ec0f3ec98 (patch) | |
| tree | 7986b288489dac6a8a70787dbdedfc0c064a0c02 /mesalib/scons | |
| parent | 27bec2ba601ec12334e6b7564034f87ab7c9522b (diff) | |
| parent | a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 (diff) | |
| download | vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.gz vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.bz2 vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/scons')
| -rw-r--r-- | mesalib/scons/gallium.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index 221d1848f..86adc3e6a 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -289,6 +289,8 @@ def generate(env): cppdefines += ['_DEBUG'] if platform == 'windows': cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_USER'] + if platform == 'haiku': + cppdefines += ['BEOS_THREADS'] if env['embedded']: cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED'] env.Append(CPPDEFINES = cppdefines) @@ -348,7 +350,7 @@ def generate(env): ccflags += ['-m64'] if platform == 'darwin': ccflags += ['-fno-common'] - if env['platform'] != 'windows': + if env['platform'] not in ('windows', 'haiku'): ccflags += ['-fvisibility=hidden'] # See also: # - http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html |