102 lines
3.7 KiB
Diff
102 lines
3.7 KiB
Diff
diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
|
|
--- mesa-20091221/src/mesa/drivers/dri/Makefile.da 2009-12-21 08:09:11.000000000 +1000
|
|
+++ mesa-20091221/src/mesa/drivers/dri/Makefile 2009-12-21 08:43:03.000000000 +1000
|
|
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
|
|
|
|
|
|
|
|
-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
|
|
+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
|
|
|
|
|
|
$(TOP)/$(LIB_DIR):
|
|
-mkdir $(TOP)/$(LIB_DIR)
|
|
|
|
+libdricore.so:
|
|
+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
|
|
+
|
|
+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
|
|
+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
|
|
|
|
subdirs:
|
|
@for dir in $(DRI_DIRS) ; do \
|
|
@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
|
|
$(pcedit) $< > $@
|
|
|
|
|
|
-install: dri.pc
|
|
+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
|
|
@for dir in $(DRI_DIRS) ; do \
|
|
if [ -d $$dir ] ; then \
|
|
(cd $$dir && $(MAKE) install) || exit 1 ; \
|
|
fi \
|
|
done
|
|
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
|
+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
|
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
|
|
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
|
|
$(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
|
|
@@ -51,5 +58,6 @@ clean:
|
|
(cd $$dir && $(MAKE) clean) ; \
|
|
fi \
|
|
done
|
|
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
|
|
-rm -f common/*.o
|
|
-rm -f *.pc
|
|
diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
|
|
--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da 2009-12-21 08:09:11.000000000 +1000
|
|
+++ mesa-20091221/src/mesa/drivers/dri/Makefile.template 2009-12-21 08:43:40.000000000 +1000
|
|
@@ -1,6 +1,6 @@
|
|
# -*-makefile-*-
|
|
|
|
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
|
|
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
|
|
|
|
COMMON_GALLIUM_SOURCES = \
|
|
../common/utils.c \
|
|
@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
|
|
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
|
|
$(TOP)/src/mesa/drivers/dri/Makefile.template
|
|
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
|
|
- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
|
|
+ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
|
|
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
|
|
$(DRI_LIB_DEPS)
|
|
|
|
|
|
diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
|
|
--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da 2009-12-21 08:09:11.000000000 +1000
|
|
+++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S 2009-12-21 08:43:03.000000000 +1000
|
|
@@ -77,7 +77,6 @@
|
|
*/
|
|
|
|
.globl _generic_read_RGBA_span_BGRA8888_REV_MMX
|
|
-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
|
|
.type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
|
|
_generic_read_RGBA_span_BGRA8888_REV_MMX:
|
|
pushl %ebx
|
|
@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
|
|
*/
|
|
|
|
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
.type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
|
|
_generic_read_RGBA_span_BGRA8888_REV_SSE:
|
|
pushl %esi
|
|
@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
|
|
.text
|
|
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
|
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
|
.type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
|
|
_generic_read_RGBA_span_BGRA8888_REV_SSE2:
|
|
pushl %esi
|
|
@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
|
|
.text
|
|
.globl _generic_read_RGBA_span_RGB565_MMX
|
|
- .hidden _generic_read_RGBA_span_RGB565_MMX
|
|
.type _generic_read_RGBA_span_RGB565_MMX, @function
|
|
|
|
_generic_read_RGBA_span_RGB565_MMX:
|