diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-13 09:15:07 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-13 09:15:07 -0600 |
| commit | 2cc1b7c742aa1195e6f9cce2c9d0ded804af9dea (patch) | |
| tree | 7d0d5e951ffc39cdb91672208ea82b6e8755fab1 /src/mesa | |
| parent | 9350fd62b6b8dbee77b0c3c4f23195eaee3045d7 (diff) | |
gallium: another attempt at fixing libglapi.a compilation for DRI builds
If building for DRI, make a dummy/empty libglapi.a for now.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index affd81b828..3ce30a1e25 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -19,12 +19,7 @@ include sources -# XXX work-around glapi.c build failure for DRI builds: -ifeq ($(WINDOW_SYSTEM), dri) -GLAPI_LIB = -else GLAPI_LIB = libglapi.a -endif # Default: build dependencies, then asm_subdirs, then convenience @@ -42,7 +37,11 @@ libmesa.a: $(MESA_OBJECTS) asm_subdirs # Make archive of gl* API dispatcher functions only $(GLAPI_LIB): $(GLAPI_OBJECTS) asm_subdirs - @ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS) + if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \ + $(TOP)/bin/mklib -o glapi -static ; \ + else \ + $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS) ; \ + fi ###################################################################### |