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.
This commit is contained in:
parent
f76787b3ea
commit
aae56150f5
|
@ -38,7 +38,9 @@ C_SOURCES = \
|
||||||
r3xx_vertprog.c \
|
r3xx_vertprog.c \
|
||||||
r3xx_vertprog_dump.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 ###
|
### Basic defines ###
|
||||||
|
@ -52,6 +54,7 @@ INCLUDES = \
|
||||||
-I$(TOP)/include \
|
-I$(TOP)/include \
|
||||||
-I$(TOP)/src/mesa \
|
-I$(TOP)/src/mesa \
|
||||||
-I$(TOP)/src/glsl \
|
-I$(TOP)/src/glsl \
|
||||||
|
-I$(TOP)/src/mapi
|
||||||
|
|
||||||
|
|
||||||
##### TARGETS #####
|
##### TARGETS #####
|
||||||
|
|
|
@ -4,6 +4,7 @@ env = env.Clone()
|
||||||
env.Append(CPPPATH = '#/include')
|
env.Append(CPPPATH = '#/include')
|
||||||
env.Append(CPPPATH = '#/src/mesa')
|
env.Append(CPPPATH = '#/src/mesa')
|
||||||
env.Append(CPPPATH = '#/src/glsl')
|
env.Append(CPPPATH = '#/src/glsl')
|
||||||
|
env.Append(CPPPATH = '#/src/mapi')
|
||||||
|
|
||||||
# temporary fix
|
# temporary fix
|
||||||
env['CFLAGS'] = str(env['CFLAGS']).replace('-Werror=declaration-after-statement', '')
|
env['CFLAGS'] = str(env['CFLAGS']).replace('-Werror=declaration-after-statement', '')
|
||||||
|
@ -43,6 +44,8 @@ r300compiler = env.ConvenienceLibrary(
|
||||||
'r3xx_vertprog.c',
|
'r3xx_vertprog.c',
|
||||||
'r3xx_vertprog_dump.c',
|
'r3xx_vertprog_dump.c',
|
||||||
'memory_pool.c',
|
'memory_pool.c',
|
||||||
|
'#/src/glsl/ralloc.c',
|
||||||
|
'#/src/mesa/program/register_allocate.c'
|
||||||
])
|
])
|
||||||
|
|
||||||
Return('r300compiler')
|
Return('r300compiler')
|
||||||
|
|
Loading…
Reference in New Issue