diff options
| author | Sean D'Epagnier <geckosenator@freedesktop.org> | 2006-08-18 10:38:15 +0000 |
|---|---|---|
| committer | Sean D'Epagnier <geckosenator@freedesktop.org> | 2006-08-18 10:38:15 +0000 |
| commit | 7e4152f0ed46f644a4247444e18dc7ad6c9832b0 (patch) | |
| tree | e281f83eff5b387fa4a92d81ced80c91716e0899 /src/mesa/Makefile | |
| parent | bd87c303e94659941a7c623d0b836e3ff317cfb4 (diff) | |
The driver now compiles correctly without any x headers or libraries installed
The bitmap and stroke code can't be shared with glx anymore because of this.
The model for the mini teapot is restored and I have tested it to work with
linux-fbdev and linux-solo
The driver recognizes 32bpp where there is no alpha (my radeon 7500) It also
sets the correct number of cmap entrees (instead of 256 which can be an error)
Diffstat (limited to 'src/mesa/Makefile')
| -rw-r--r-- | src/mesa/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index bf600e0578..16cf6709ea 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -38,7 +38,6 @@ default: fi - ###################################################################### # BeOS driver target @@ -74,13 +73,17 @@ directfb: depend subdirs libgl-core ###################################################################### # Stand-alone Mesa libGL and libOSMesa - -STAND_ALONE_DRIVER_SOURCES = \ +STAND_ALONE_DRIVER_SOURCES_A = \ $(COMMON_DRIVER_SOURCES) \ - $(X11_DRIVER_SOURCES) \ $(GLIDE_DRIVER_SOURCES) \ - $(SVGA_DRIVER_SOURCES) \ - $(FBDEV_DRIVER_SOURCES) + $(SVGA_DRIVER_SOURCES) + +# if x11 is not installed, compiling with x11 sources will not work for fbdev +ifeq ($(DRIVER_DIRS), fbdev) +STAND_ALONE_DRIVER_SOURCES = $(STAND_ALONE_DRIVER_SOURCES_A) $(FBDEV_DRIVER_SOURCES) +else +STAND_ALONE_DRIVER_SOURCES = $(STAND_ALONE_DRIVER_SOURCES_A) $(X11_DRIVER_SOURCES) +endif STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o) @@ -133,6 +136,7 @@ ALL_SOURCES = \ $(X86_SOURCES) \ $(COMMON_DRIVER_SOURCES)\ $(X11_DRIVER_SOURCES) \ + $(FBDEV_DRIVER_SOURCES) \ $(OSMESA_DRIVER_SOURCES) |