OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: Pass flags to locate Xlib headers and libraries

Browse Source 
eglplatform.h pulls in Xlib.h on X11 platforms. Likewise, the egl glx
driver and egl programs needs to link to libX11. Make sure we use the
locations the user told us about.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
This commit is contained in:
Dan Nicholson
2010-04-18 09:33:03 -07:00
parent 8e5effefc7
commit 88be2171e7
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
progs/egl/Makefile
View File

@@ -4,7 +4,7 @@ TOP = ../..
include $(TOP)/configs/current include $(TOP)/configs/current
INCLUDE_DIRS = -I$(TOP)/include INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS)
HEADERS = $(TOP)/include/GLES/egl.h HEADERS = $(TOP)/include/GLES/egl.h
LIB_DEP = $(TOP)/$(LIB_DIR)/libEGL.so LIB_DEP = $(TOP)/$(LIB_DIR)/libEGL.so

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) \