Mesa (master): scons: Buid libGL.so (WIP).
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Jun 30 17:36:10 UTC 2011
Module: Mesa
Branch: master
Commit: 2699fce0d69db5158427c8b6c8194b2eefc5e58b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2699fce0d69db5158427c8b6c8194b2eefc5e58b
Author: José Fonseca <jfonseca at vmware.com>
Date: Fri Jun 17 20:12:18 2011 +0100
scons: Buid libGL.so (WIP).
---
common.py | 2 +-
scons/gallium.py | 19 +++++++++++++++++--
src/SConscript | 1 +
src/gallium/targets/libgl-xlib/SConscript | 2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/common.py b/common.py
index 8f13186..8657030 100644
--- a/common.py
+++ b/common.py
@@ -90,6 +90,6 @@ def AddOptions(opts):
opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
- opts.Add(BoolOption('quiet', 'DEPRECATED: quiet command lines', 'yes'))
+ opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
if host_platform == 'windows':
opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
diff --git a/scons/gallium.py b/scons/gallium.py
index bde1a3c..7b23963 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -289,8 +289,21 @@ def generate(env):
'PTHREADS',
'HAVE_POSIX_MEMALIGN',
]
- if env['platform'] == 'darwin':
- cppdefines += ['_DARWIN_C_SOURCE']
+ if env['platform'] == 'darwin':
+ cppdefines += [
+ '_DARWIN_C_SOURCE',
+ 'GLX_USE_APPLEGL',
+ 'GLX_DIRECT_RENDERING',
+ ]
+ else:
+ cppdefines += [
+ 'GLX_DIRECT_RENDERING',
+ 'GLX_INDIRECT_RENDERING',
+ ]
+ if env['platform'] in ('linux', 'freebsd'):
+ cppdefines += ['HAVE_ALIAS']
+ else:
+ cppdefines += ['GLX_ALIAS_UNSUPPORTED']
if platform == 'windows':
cppdefines += [
'WIN32',
@@ -381,6 +394,8 @@ def generate(env):
ccflags += ['-O0']
else:
ccflags += ['-O3']
+ # Work around aliasing bugs - developers should comment this out
+ ccflags += ['-fno-strict-aliasing']
ccflags += ['-g3']
if env['build'] in ('checked', 'profile'):
# See http://code.google.com/p/jrfonseca/wiki/Gprof2Dot#Which_options_should_I_pass_to_gcc_when_compiling_for_profiling?
diff --git a/src/SConscript b/src/SConscript
index 7b614da..6d7bd6c 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,6 +22,7 @@ SConscript('mesa/SConscript')
SConscript('mapi/vgapi/SConscript')
if env['platform'] != 'embedded':
+ SConscript('glx/SConscript')
SConscript('egl/main/SConscript')
SConscript('glu/sgi/SConscript')
SConscript('glut/glx/SConscript')
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index ca15372..7d5d9bc 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -54,7 +54,7 @@ libgl = env.SharedLibrary(
source = sources,
)
-if True:
+if False:
# XXX: Only install this libGL.so if DRI not enabled
libgl = env.InstallSharedLibrary(libgl, version=(1, 5))
More information about the mesa-commit
mailing list