Mesa (master): r300g: Fix non-dri builds
Tom Stellard
tstellar at kemper.freedesktop.org
Sun May 29 04:48:24 UTC 2011
Module: Mesa
Branch: master
Commit: aae56150f5d59d45e13a4033b20f0ccf20a3319c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aae56150f5d59d45e13a4033b20f0ccf20a3319c
Author: Tom Stellard <tstellar at gmail.com>
Date: Tue May 24 21:11:03 2011 -0700
r300g: Fix non-dri builds
This is just a temporary solution for now until there is a better way
to share code between mesa and gallium.
---
src/mesa/drivers/dri/r300/compiler/Makefile | 5 ++++-
src/mesa/drivers/dri/r300/compiler/SConscript | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/compiler/Makefile b/src/mesa/drivers/dri/r300/compiler/Makefile
index 4bedfac..5aa1332 100644
--- a/src/mesa/drivers/dri/r300/compiler/Makefile
+++ b/src/mesa/drivers/dri/r300/compiler/Makefile
@@ -38,7 +38,9 @@ C_SOURCES = \
r3xx_vertprog.c \
r3xx_vertprog_dump.c \
\
- memory_pool.c
+ memory_pool.c \
+ $(TOP)/src/glsl/ralloc.c \
+ $(TOP)/src/mesa/program/register_allocate.c
### Basic defines ###
@@ -52,6 +54,7 @@ INCLUDES = \
-I$(TOP)/include \
-I$(TOP)/src/mesa \
-I$(TOP)/src/glsl \
+ -I$(TOP)/src/mapi
##### TARGETS #####
diff --git a/src/mesa/drivers/dri/r300/compiler/SConscript b/src/mesa/drivers/dri/r300/compiler/SConscript
index 9931537..2c748b6 100755
--- a/src/mesa/drivers/dri/r300/compiler/SConscript
+++ b/src/mesa/drivers/dri/r300/compiler/SConscript
@@ -4,6 +4,7 @@ env = env.Clone()
env.Append(CPPPATH = '#/include')
env.Append(CPPPATH = '#/src/mesa')
env.Append(CPPPATH = '#/src/glsl')
+env.Append(CPPPATH = '#/src/mapi')
# temporary fix
env['CFLAGS'] = str(env['CFLAGS']).replace('-Werror=declaration-after-statement', '')
@@ -43,6 +44,8 @@ r300compiler = env.ConvenienceLibrary(
'r3xx_vertprog.c',
'r3xx_vertprog_dump.c',
'memory_pool.c',
+ '#/src/glsl/ralloc.c',
+ '#/src/mesa/program/register_allocate.c'
])
Return('r300compiler')
More information about the mesa-commit
mailing list