Mesa (master): configs: fix, simplify RADEON_LIBS, RADEON_CFLAGS

Brian Paul brianp at kemper.freedesktop.org
Thu Jan 12 14:56:17 UTC 2012


Module: Mesa
Branch: master
Commit: c7188ece0ee33f13e6f6aa776a5639bcd4047e5b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7188ece0ee33f13e6f6aa776a5639bcd4047e5b

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 12 07:53:22 2012 -0700

configs: fix, simplify RADEON_LIBS, RADEON_CFLAGS

Fixes build problems with the r200, radeon drivers.

NOTE: This is a candidate for the 8.0 branch.

---

 configs/linux-dri |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configs/linux-dri b/configs/linux-dri
index 6990c3a..e63790e 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -70,7 +70,6 @@ INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
 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_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_radeon)
+RADEON_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_radeon)
 RADEON_LDFLAGS = $(LIBDRM_RADEON_LIBS)




More information about the mesa-commit mailing list