fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove talloc from the SCons build system.

Browse source 
(cherry picked from commit 8aac5d123c)

Conflicts:
	src/SConscript
	src/gallium/targets/egl-static/SConscript
	src/glsl/SConscript
	src/mesa/SConscript
This commit is contained in:
Kenneth Graunke 2011-02-03 16:11:29 -08:00
parent 72f90dc3ee
commit 5c1e361b8e
7 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/SConscript
View file

@ -4,7 +4,6 @@ SConscript('mapi/vgapi/SConscript')
if env['platform'] == 'windows':
SConscript('egl/main/SConscript')
SConscript('talloc/SConscript')
SConscript('glsl/SConscript')
SConscript('mapi/glapi/SConscript')

1
src/gallium/targets/SConscript.dri
View file

@ -72,7 +72,6 @@ COMMON_DRI_DRM_OBJECTS = [
drienv.AppendUnique(LIBS = [
'expat',
'talloc',
])
Export([

1
src/gallium/targets/libgl-gdi/SConscript
View file

@ -15,7 +15,6 @@ env.Append(LIBS = [
'user32',
'kernel32',
'ws2_32',
talloc,
])
sources = ['libgl_gdi.c']

1
src/gallium/targets/libgl-xlib/SConscript
View file

@ -23,7 +23,6 @@ env.Prepend(LIBS = [
mesa,
glsl,
gallium,
'talloc'
])
sources = [

6
src/glsl/SConscript
View file

@ -7,11 +7,9 @@ env = env.Clone()
env.Prepend(CPPPATH = [
'#src/mapi',
'#src/mesa',
'#src/glsl',
])
if env['platform'] == 'windows':
env.Prepend(CPPPATH = ['#src/talloc'])
sources = [
'glcpp/glcpp-lex.c',
'glcpp/glcpp-parse.c',
@ -97,7 +95,7 @@ if env['platform'] == 'windows':
'user32',
])
env.Prepend(LIBS = [glsl, talloc])
env.Prepend(LIBS = [glsl])
env.Program(
target = 'glsl2',

1
src/mesa/SConscript
View file

@ -17,7 +17,6 @@ if env['platform'] == 'windows':
'_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
])
env.Prepend(CPPPATH = ['#src/talloc'])
else:
env.Append(CPPDEFINES = [
'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)

20
src/talloc/SConscript
View file

@ -1,20 +0,0 @@
Import('*')
if env['platform'] != 'windows':
Return()
env = env.Clone()
talloc = env.SharedLibrary(
target = 'talloc',
source = ['talloc.c', 'talloc.def'],
)
env.InstallSharedLibrary(talloc)
if env['platform'] == 'windows':
talloc = env.FindIxes(talloc, 'LIBPREFIX', 'LIBSUFFIX')
else:
talloc = env.FindIxes(talloc, 'SHLIBPREFIX', 'SHLIBSUFFIX')
Export('talloc')