summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCooper Yuan <cooperyuan@gmail.com>2009-09-25 13:21:08 +0800
committerCooper Yuan <cooperyuan@gmail.com>2009-09-25 13:21:08 +0800
commit655706f38f62b8b88714e76ff88fbf87e53de9ae (patch)
treee1dbbb0a3d2bdf54849a7f90ce138a89411133b1
parent88ba2d2da4d26165af36ecd7563f24d4800b6b02 (diff)
xvmc: link libmesagallium.a
-rw-r--r--src/gallium/winsys/g3dvl/radeon/Makefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/gallium/winsys/g3dvl/radeon/Makefile b/src/gallium/winsys/g3dvl/radeon/Makefile
index f753c0edb..71912bb9c 100644
--- a/src/gallium/winsys/g3dvl/radeon/Makefile
+++ b/src/gallium/winsys/g3dvl/radeon/Makefile
@@ -31,14 +31,8 @@ WINSYS_OBJECTS = $(WINSYS_SOURCES:.c=.o)
LIBS = \
$(GALLIUM_DRIVERS) \
$(GALLIUM_AUXILIARIES) \
- $(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a
-
-# XXX temporary (should create a separate lib with the GL API funcs and
-# mesa code, as done for ES 1.x, 2.x, OpenVG, etc)
-UNUSED_LIBS = \
- $(TOP)/src/mesa/libglapi.a \
- $(TOP)/src/mesa/libmesagallium.a \
-
+ $(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
+ $(TOP)/src/mesa/libmesagallium.a
LOCAL_CFLAGS =
@@ -63,7 +57,7 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(WINSYS_OBJECTS) $(LIBS)
-linker "$(CC)" \
-noprefix \
$(MKLIB_OPTIONS) $(WINSYS_OBJECTS) \
- -Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive $(DRI_LIB_DEPS)
+ -Wl,--start-group $(LIBS) -Wl,--end-group $(DRI_LIB_DEPS)
depend: $(ALL_SOURCES)