diff options
| author | Brian Paul <[email protected]> | 2009-02-09 09:22:22 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-02-09 09:22:22 -0700 |
| commit | e97681c7f551a2a2a6bd5eff0f4192a870c816c0 (patch) | |
| tree | dff2bf0e6d22efb92af131f64be0621ed316977c /src/mesa/Makefile | |
| parent | 1a46c8a062aea59de5cf55881104489db5d609e5 (diff) | |
| parent | b907d4cd8fafe719b4f87d877562829548937485 (diff) | |
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
Diffstat (limited to 'src/mesa/Makefile')
| -rw-r--r-- | src/mesa/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 6b4057030ef..552c20e0b9b 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -3,8 +3,7 @@ TOP = ../.. include $(TOP)/configs/current -include sources - +include sources.mak .SUFFIXES : .cpp @@ -19,6 +18,7 @@ include sources + # Default: build dependencies, then asm_subdirs, then convenience # libs (.a) and finally the device drivers: default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs @@ -34,8 +34,11 @@ libmesa.a: $(MESA_OBJECTS) # Make archive of gl* API dispatcher functions only libglapi.a: $(GLAPI_OBJECTS) - @ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS) - + @if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \ + touch libglapi.a ; \ + else \ + $(MKLIB) -o glapi -static $(GLAPI_OBJECTS) ; \ + fi ###################################################################### # Device drivers |