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

scons: fix MSVC, MinGW build

Browse source 
Duplicate the glsl_types_hack.cpp work-around from the libgl-xlib target.
This commit is contained in:
Brian Paul 2015-10-17 10:02:04 -06:00
parent 7e6aafd6ab
commit 3272f632ee
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,10 @@ env = env.Clone()
env.Append(CPPPATH = [
'#src',
'#src/mesa',
'#src/mapi',
'#src/glsl',
'#src/glsl/nir',
'#src/gallium/state_trackers/wgl',
'#src/gallium/winsys/sw',
])
@ -20,7 +24,11 @@ env.Append(LIBS = [
env.Prepend(LIBS = [mesautil])
sources = ['libgl_gdi.c']
sources = [
'libgl_gdi.c',
'glsl_types_hack.cpp'
]
drivers = []
if True:

3
src/gallium/targets/libgl-gdi/glsl_types_hack.cpp Normal file
View file

@ -0,0 +1,3 @@
/* errrg scons.. otherwise "scons: *** Two environments with different actions were specified for the same target: $mesa/build/linux-x86_64-debug/glsl/nir/glsl_types.os" */
#include "glsl_types.cpp"

7
src/gallium/targets/osmesa/SConscript
View file

@ -5,6 +5,8 @@ env = env.Clone()
env.Prepend(CPPPATH = [
'#src/mapi',
'#src/mesa',
'#src/glsl',
'#src/glsl/nir',
#Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
])
@ -22,7 +24,10 @@ env.Prepend(LIBS = [
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_SOFTPIPE'])
sources = ['target.c']
sources = [
'target.c',
'glsl_types_hack.cpp'
]
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')

3
src/gallium/targets/osmesa/glsl_types_hack.cpp Normal file
View file

@ -0,0 +1,3 @@
/* errrg scons.. otherwise "scons: *** Two environments with different actions were specified for the same target: $mesa/build/linux-x86_64-debug/glsl/nir/glsl_types.os" */
#include "glsl_types.cpp"