fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-14 14:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '7.8'

Browse source 
Conflicts:
	progs/egl/Makefile

progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.
This commit is contained in:
Dan Nicholson 2010-04-19 20:22:48 -07:00
commit 02224ec4e0
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/egl/drivers/glx/Makefile
View file

@ -10,7 +10,7 @@ EGL_INCLUDES = \
-I$(TOP)/include \ -I$(TOP)/include \
-I$(TOP)/src/egl/main -I$(TOP)/src/egl/main
EGL_CFLAGS = EGL_CFLAGS = $(X11_CFLAGS)
EGL_LIBS = -lX11 -lGL EGL_LIBS = $(X11_LIBS) -lGL
include ../Makefile.template include ../Makefile.template

2
src/egl/main/Makefile
View file

@ -7,7 +7,7 @@ include $(TOP)/configs/current
EGL_MAJOR = 1 EGL_MAJOR = 1
EGL_MINOR = 0 EGL_MINOR = 0
INCLUDE_DIRS = -I$(TOP)/include INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS)
HEADERS = \ HEADERS = \
eglcompiler.h \ eglcompiler.h \

1
src/gallium/state_trackers/egl/Makefile
View file

@ -16,6 +16,7 @@ x11_INCLUDES = \
-I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/glx \ -I$(TOP)/src/glx \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
$(X11_CFLAGS) \
$(shell pkg-config --cflags-only-I libdrm) $(shell pkg-config --cflags-only-I libdrm)
x11_SOURCES = $(wildcard x11/*.c) \ x11_SOURCES = $(wildcard x11/*.c) \

3
src/gallium/targets/libgl-xlib/Makefile
View file

@ -20,7 +20,8 @@ INCLUDE_DIRS = \
-I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/state_trackers/glx/xlib \ -I$(TOP)/src/gallium/state_trackers/glx/xlib \
-I$(TOP)/src/gallium/auxiliary -I$(TOP)/src/gallium/auxiliary \
$(X11_CFLAGS)
DEFINES += \ DEFINES += \
-DGALLIUM_SOFTPIPE -DGALLIUM_SOFTPIPE