fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 15:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: Link ralloc.c and register_allocate.c into separate library

Browse source
This commit is contained in:
Matt Turner 2012-09-10 13:34:09 -07:00 • committed by Andreas Boll
parent e04413cbb0
commit 8dc4048b3b
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/drivers/r300/Makefile.am
View file

@ -1,7 +1,7 @@
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
noinst_LTLIBRARIES = libr300.la
noinst_LTLIBRARIES = libr300.la libr300-helper.la
check_PROGRAMS = r300_compiler_tests
testdir = compiler/tests
TESTS = r300_compiler_tests
@ -26,11 +26,20 @@ r300_compiler_tests_SOURCES = \
$(testdir)/rc_test_helpers.c \
$(testdir)/unit_test.c
libr300_la_SOURCES = \
$(C_SOURCES) \
libr300_la_SOURCES = $(C_SOURCES)
# These two files are included in libmesagallium, which is included in the dri
# targets. So, they were added directly to r300g the dri-r300 target would have
# duplicated symbols, and if they weren't the other *-r300 targets would fail
# with undefined symbols.
#
# Solve this by building them into a separate helper library that can be linked
# in place of libmesagallium.
libr300_helper_la_SOURCES = \
$(top_srcdir)/src/glsl/ralloc.c \
$(top_srcdir)/src/mesa/program/register_allocate.c
#XXX: Delete this when all r300 targets are converted to automake.
all-local: libr300.la
all-local: libr300.la libr300-helper.la
ln -f $(builddir)/.libs/libr300.a $(builddir)/libr300.a
ln -f $(builddir)/.libs/libr300-helper.a $(builddir)/libr300-helper.a

1
src/gallium/targets/pipe-loader/Makefile
View file

@ -48,6 +48,7 @@ nouveau_SYS = $(NOUVEAU_LIBS)
# r300 pipe driver
r300_LIBS = \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/r300/libr300-helper.a \
$(TOP)/src/gallium/drivers/r300/libr300.a
r300_SYS += $(RADEON_LIBS)

4
src/gallium/targets/vdpau-r300/Makefile
View file

@ -6,14 +6,14 @@ LIBBASENAME = vdpau_r300
DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r300/libr300-helper.a \
$(TOP)/src/gallium/drivers/r300/libr300.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/rbug/librbug.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/galahad/libgalahad.a \
$(TOP)/src/gallium/auxiliary/libgallium.a \
$(TOP)/src/mesa/libmesagallium.a
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
target.c \

1
src/gallium/targets/xorg-r300/Makefile
View file

@ -13,6 +13,7 @@ DRIVER_DEFINES = \
DRIVER_PIPES = \
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/r300/libr300-helper.a \
$(TOP)/src/gallium/drivers/r300/libr300.a \
$(TOP)/src/gallium/drivers/galahad/libgalahad.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \

1
src/gallium/targets/xvmc-r300/Makefile
View file

@ -6,6 +6,7 @@ LIBBASENAME = XvMCr300
DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r300/libr300-helper.a \
$(TOP)/src/gallium/drivers/r300/libr300.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \