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/src/glu/sgi/SConscript | |
| 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/src/glu/sgi/SConscript')
| -rw-r--r-- | mesalib/src/glu/sgi/SConscript | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mesalib/src/glu/sgi/SConscript b/mesalib/src/glu/sgi/SConscript index 94c74267f..97405d869 100644 --- a/mesalib/src/glu/sgi/SConscript +++ b/mesalib/src/glu/sgi/SConscript @@ -122,12 +122,18 @@ else: ]) target = 'glu' -glu = env.SharedLibrary( - target = target, - source = sources -) +if env['platform'] == 'haiku': + glu = env.StaticLibrary( + target = target, + source = sources + ) +else: + glu = env.SharedLibrary( + target = target, + source = sources + ) + env.Alias('glu', env.InstallSharedLibrary(glu, version=(1, 3, 0))) -env.Alias('glu', env.InstallSharedLibrary(glu, version=(1, 3, 0))) if env['platform'] == 'windows': glu = env.FindIxes(glu, 'LIBPREFIX', 'LIBSUFFIX') |