From: José Fonseca Date: Fri, 26 Oct 2012 08:45:59 +0000 (+0100) Subject: scons: Build xlib swrast too. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54536686b23f144b4734cc8f16daaf86d2bb8fb3;p=mesa.git scons: Build xlib swrast too. Helpful for debugging. --- diff --git a/src/mesa/drivers/SConscript b/src/mesa/drivers/SConscript index ab0f8943290..f1c4da6b86c 100644 --- a/src/mesa/drivers/SConscript +++ b/src/mesa/drivers/SConscript @@ -2,5 +2,8 @@ Import('*') SConscript('osmesa/SConscript') +if env['x11']: + SConscript('x11/SConscript') + if env['platform'] == 'windows': SConscript('windows/gdi/SConscript') diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript new file mode 100644 index 00000000000..cfa2815e297 --- /dev/null +++ b/src/mesa/drivers/x11/SConscript @@ -0,0 +1,48 @@ +Import('*') + +env = env.Clone() + +env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/mesa/main', +]) + +env.Append(CPPDEFINES = ['USE_XSHM']) + +env.Prepend(LIBS = env['X11_LIBS']) + +env.Prepend(LIBS = [ + glapi, + glsl, + mesa, +]) + +sources = [ + 'fakeglx.c', + 'glxapi.c', + 'xfonts.c', + 'xm_api.c', + 'xm_buffer.c', + 'xm_dd.c', + 'xm_line.c', + 'xm_tri.c', +] + +# The sources depend on the python-generated GL API files/headers. +env.Depends(sources, glapi_headers) + +# libGL.so.1.6 +libgl_1_6 = env.SharedLibrary( + target ='GL', + source = sources, + SHLIBSUFFIX = env['SHLIBSUFFIX'] + '.1.6', +) + +# libGL.so.1 +libgl = env.subst('${SHLIBPREFIX}GL${SHLIBSUFFIX}') +libgl_1 = libgl + '.1' +env.Command(libgl_1, libgl_1_6, "ln -sf ${SOURCE.file} ${TARGET}") +env.Command(libgl, libgl_1, "ln -sf ${SOURCE.file} ${TARGET}") + +env.Alias('libgl-xlib-swrast', libgl)