diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /mesalib/configs/linux-dri | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'mesalib/configs/linux-dri')
| -rw-r--r-- | mesalib/configs/linux-dri | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index 26c73ccf0..a3e9baba2 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -44,8 +44,8 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib MESA_MODULES = $(TOP)/src/mesa/libmesa.a -LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) -LIBDRM_LIB = $(shell pkg-config --libs libdrm) +LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) +LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -lpthread -ldl $(LIBDRM_LIB) @@ -64,13 +64,13 @@ GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i915 i965 nouveau r200 r300 r600 radeon swrast -INTEL_LIBS = $(shell pkg-config --libs libdrm_intel) -INTEL_CFLAGS = $(shell pkg-config --cflags libdrm_intel) +INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel) +INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel) -NOUVEAU_LIBS = $(shell pkg-config --libs libdrm_nouveau) -NOUVEAU_CFLAGS = $(shell pkg-config --cflags libdrm_nouveau) +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) +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) |