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.

diff --git a/src/mesa/drivers/dri/r300/compiler/Makefile b/src/mesa/drivers/dri/r300/compiler/Makefile
index 4bedfacd632ff5e21bd4ae2774d3ee32bf5daef7..5aa13329ac2d90cc4f838430c6af8f4f261759a4 100644 (file)
--- 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 9931537492e4b8483c75c1174fc612c8fd9aaaae..2c748b6e2144250c9bf13d6ff8d5e64fbdc1ea22 100755 (executable)
--- 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')