diff options
| author | Cooper Yuan <cooperyuan@gmail.com> | 2009-09-24 14:43:56 +0800 |
|---|---|---|
| committer | Cooper Yuan <cooperyuan@gmail.com> | 2009-09-24 14:43:56 +0800 |
| commit | 2290d078e9b1af94c3f6a1ff72e1b91cd8f375a1 (patch) | |
| tree | ee27966651db76f83d258b0c70ae9b9aa90e36c6 | |
| parent | ba68bf8f403b34d5fd4192fa9a7ea40bb2adb2d3 (diff) | |
xvmc: refine Makefile again
| -rw-r--r-- | src/gallium/winsys/g3dvl/radeon/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/gallium/winsys/g3dvl/radeon/Makefile b/src/gallium/winsys/g3dvl/radeon/Makefile index 9520ecab1..f753c0edb 100644 --- a/src/gallium/winsys/g3dvl/radeon/Makefile +++ b/src/gallium/winsys/g3dvl/radeon/Makefile @@ -4,6 +4,7 @@ TOP = ../../../../.. +DRMDIR ?= /usr include $(TOP)/configs/current @@ -17,7 +18,10 @@ INCLUDE_DIRS = \ -I$(TOP)/src/mesa/main \ -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/auxiliary + -I$(TOP)/src/gallium/drivers/r300 \ + -I$(TOP)/src/gallium/auxiliary \ + -I$(TOP)/src/gallium/winsys/drm/radeon/core \ + -I${DRMDIR}/include/drm WINSYS_SOURCES = \ radeon_vl.c @@ -26,7 +30,8 @@ WINSYS_OBJECTS = $(WINSYS_SOURCES:.c=.o) LIBS = \ $(GALLIUM_DRIVERS) \ - $(GALLIUM_AUXILIARIES) + $(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) @@ -37,6 +42,7 @@ UNUSED_LIBS = \ LOCAL_CFLAGS = +DRI_LIB_DEPS += -ldrm_radeon .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@ @@ -51,14 +57,13 @@ default: depend library Makefile library: $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) -# Make the egl_softpipe.so library +# Make the libradeon_vl.so library $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(WINSYS_OBJECTS) $(LIBS) $(TOP)/bin/mklib -o $(DRIVER_NAME) \ -linker "$(CC)" \ -noprefix \ - -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) \ - -Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive + -Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive $(DRI_LIB_DEPS) depend: $(ALL_SOURCES) @@ -81,7 +86,7 @@ tags: etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h clean: - -rm -f *.o *~ *.bak + -rm -f *.so *.o *~ *.bak include depend |