diff options
| author | Brian Paul <[email protected]> | 2009-02-09 10:37:38 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-02-09 10:37:38 -0700 |
| commit | 2438161823630a6e647c105ad92cf2b0cd740d00 (patch) | |
| tree | c9093294c4b87a653b5bb6e2e9a420cddf853edc | |
| parent | abbe96cb6e7581a52652030e40442b943a482840 (diff) | |
mesa: build/use libmesagallium.a for gallium builds
This contains the core mesa code but excludes things not needed for gallium
such as tnl/, swrast/, swrast_setup/, etc.
| -rw-r--r-- | src/gallium/winsys/drm/Makefile.template | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/egl_xlib/Makefile | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/xlib/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template index 211f4d875ed..6756640c4ea 100644 --- a/src/gallium/winsys/drm/Makefile.template +++ b/src/gallium/winsys/drm/Makefile.template @@ -1,9 +1,9 @@ # -*-makefile-*- MESA_MODULES = \ - $(TOP)/src/mesa/libmesa.a \ + $(TOP)/src/mesa/libmesagallium.a \ $(GALLIUM_AUXILIARIES) - + COMMON_GALLIUM_SOURCES = \ $(TOP)/src/mesa/drivers/dri/common/utils.c \ $(TOP)/src/mesa/drivers/dri/common/vblank.c \ diff --git a/src/gallium/winsys/egl_xlib/Makefile b/src/gallium/winsys/egl_xlib/Makefile index 76f1b56da42..02ac47caa4e 100644 --- a/src/gallium/winsys/egl_xlib/Makefile +++ b/src/gallium/winsys/egl_xlib/Makefile @@ -34,7 +34,7 @@ LIBS = \ # mesa code, as done for ES 1.x, 2.x, OpenVG, etc) UNUSED_LIBS = \ $(TOP)/src/mesa/libglapi.a \ - $(TOP)/src/mesa/libmesa.a \ + $(TOP)/src/mesa/libmesagallium.a \ LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1 diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile index 8c2892d49b2..9d70f3cb9c1 100644 --- a/src/gallium/winsys/xlib/Makefile +++ b/src/gallium/winsys/xlib/Makefile @@ -47,7 +47,7 @@ LIBS = \ $(GALLIUM_DRIVERS) \ $(TOP)/src/gallium/state_trackers/glx/xlib/libxlib.a \ $(TOP)/src/mesa/libglapi.a \ - $(TOP)/src/mesa/libmesa.a \ + $(TOP)/src/mesa/libmesagallium.a \ $(GALLIUM_AUXILIARIES) \ $(CELL_SPU_LIB) \ diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 22ef05c335a..78b71d4676f 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -21,7 +21,8 @@ include sources.mak # 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 +default: depend asm_subdirs libmesa.a libmesagallium.a libglapi.a \ + driver_subdirs |