summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-08-18 20:20:28 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-08-18 20:20:28 +0000
commit92c43b110c22474c5304c782193494c197256ab7 (patch)
treeaaf9fe0cd803473fe7e7f23164af2034edee8872 /src/mesa
parent7e4152f0ed46f644a4247444e18dc7ad6c9832b0 (diff)
Fix-ups for linux-fbdev config. No longer build Xlib driver sources.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Makefile19
-rw-r--r--src/mesa/sources2
2 files changed, 18 insertions, 3 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 16cf6709ea..1d2f36f0fb 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -32,7 +32,9 @@ default:
elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
$(MAKE) beos ; \
elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \
- $(MAKE) directfb; \
+ $(MAKE) directfb ; \
+ elif [ "$(DRIVER_DIRS)" = "fbdev" ]; then \
+ $(MAKE) fbdev ; \
else \
$(MAKE) stand-alone ; \
fi
@@ -65,10 +67,21 @@ linux-solo: depend subdirs libmesa.a
libgl-core: $(CORE_OBJECTS)
@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS)
+ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \
+ $(GL_LIB_DEPS)
directfb: depend subdirs libgl-core
- cd drivers/directfb; $(MAKE)
+ cd drivers/directfb ; $(MAKE)
+
+
+#####################################################################
+# fbdev Mesa driver (libGL.so)
+
+fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS)
+ @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(GL_LIB_DEPS)
######################################################################
diff --git a/src/mesa/sources b/src/mesa/sources
index 905052d460..4eb5ae748f 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -337,6 +337,8 @@ OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)
COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
+FBDEV_DRIVER_OBJECTS = $(FBDEV_DRIVER_SOURCES:.c=.o)
+
### Include directories