projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8' into master
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
SConscript
diff --git
a/src/gallium/drivers/r300/SConscript
b/src/gallium/drivers/r300/SConscript
index 493d7b28bc3b4e60080e441a413c006531e0896e..27b2e30993280cc8b648fb4f9a629f588402af15 100644
(file)
--- a/
src/gallium/drivers/r300/SConscript
+++ b/
src/gallium/drivers/r300/SConscript
@@
-1,14
+1,21
@@
Import('*')
Import('*')
+r300compiler = SConscript('#/src/mesa/drivers/dri/r300/compiler/SConscript')
+
env = env.Clone()
env = env.Clone()
+# add the paths for r300compiler
+env.Append(CPPPATH = [
+ '#/src/mesa/drivers/dri/r300/compiler',
+ '#/src/gallium/winsys/drm/radeon/core',
+ '#/include',
+ '#/src/mesa',
+])
r300 = env.ConvenienceLibrary(
target = 'r300',
source = [
r300 = env.ConvenienceLibrary(
target = 'r300',
source = [
- 'r3xx_fs.c',
- 'r5xx_fs.c',
+ 'r300_blit.c',
'r300_chipset.c',
'r300_chipset.c',
- 'r300_clear.c',
'r300_context.c',
'r300_debug.c',
'r300_emit.c',
'r300_context.c',
'r300_debug.c',
'r300_emit.c',
@@
-21,9
+28,10
@@
r300 = env.ConvenienceLibrary(
'r300_state_derived.c',
'r300_state_invariant.c',
'r300_vs.c',
'r300_state_derived.c',
'r300_state_invariant.c',
'r300_vs.c',
- 'r300_surface.c',
'r300_texture.c',
'r300_texture.c',
- ])
+ 'r300_tgsi_to_rc.c',
+ 'r300_transfer.c',
+ ] + r300compiler) + r300compiler
Export('r300')
Export('r300')