diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-03 08:18:04 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-03 08:18:04 +0200 |
| commit | cda19b1d226d565f1ca4327aeae827c621b3dfd6 (patch) | |
| tree | 8a511d718c888b17c257a905607068613359f9a6 /mesalib/configs/linux-dri | |
| parent | 4d7ec99788d8a1d56ff4bccea279ae8186b18cdc (diff) | |
| download | vcxsrv-cda19b1d226d565f1ca4327aeae827c621b3dfd6.tar.gz vcxsrv-cda19b1d226d565f1ca4327aeae827c621b3dfd6.tar.bz2 vcxsrv-cda19b1d226d565f1ca4327aeae827c621b3dfd6.zip | |
xserver xkeyboard-config mesa git update 3 Jun 2011
Diffstat (limited to 'mesalib/configs/linux-dri')
| -rw-r--r-- | mesalib/configs/linux-dri | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index 7ee007e35..c4132f472 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -63,11 +63,16 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 GALLIUM_TARGET_DIRS = GALLIUM_STATE_TRACKERS_DIRS = egl -DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \ +DRI_DIRS = i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \ savage sis tdfx unichrome swrast -INTEL_LIBS = `pkg-config --libs libdrm_intel` -INTEL_CFLAGS = `pkg-config --cflags libdrm_intel` +INTEL_LIBS = $(shell pkg-config --libs libdrm_intel) +INTEL_CFLAGS = $(shell pkg-config --cflags libdrm_intel) -RADEON_LIBS = `pkg-config --libs libdrm_radeon` -RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon` +NOUVEAU_LIBS = $(shell pkg-config --libs libdrm_nouveau) +NOUVEAU_CFLAGS = $(shell pkg-config --cflags libdrm_nouveau) + +LIBDRM_RADEON_LIBS = $(shell pkg-config --libs libdrm_radeon) +LIBDRM_RADEON_CFLAGS = $(shell pkg-config --cflags libdrm_radeon) +RADEON_CFLAGS = "-DHAVE_LIBDRM_RADEON=1 $(LIBDRM_RADEON_CFLAGS)" +RADEON_LDFLAGS = $(LIBDRM_RADEON_LIBS) |