diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:16:03 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:16:03 +0000 |
commit | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (patch) | |
tree | ed66dfad2f0907967e4c5e40a338b6a143b1dd7b /configs | |
parent | f72848a09a9d3069705fbe8e4daa29b9918ea56e (diff) | |
parent | e72a44215312ae1f3c812ba28e47b4aec3589de9 (diff) | |
download | external_mesa3d-a22d865f93a1db7f72e0bfe216810f67bf4c2f2c.zip external_mesa3d-a22d865f93a1db7f72e0bfe216810f67bf4c2f2c.tar.gz external_mesa3d-a22d865f93a1db7f72e0bfe216810f67bf4c2f2c.tar.bz2 |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'configs')
-rw-r--r-- | configs/autoconf.in | 18 | ||||
-rw-r--r-- | configs/default | 17 |
2 files changed, 35 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index a3eaed5..4a89716 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -105,3 +105,21 @@ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) + +# pkg-config substitutions +GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ +GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ +GL_PC_CFLAGS = @GL_PC_CFLAGS@ +DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@ +GLU_PC_REQ = @GLU_PC_REQ@ +GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@ +GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@ +GLU_PC_CFLAGS = @GLU_PC_CFLAGS@ +GLUT_PC_REQ_PRIV = @GLUT_PC_REQ_PRIV@ +GLUT_PC_LIB_PRIV = @GLUT_PC_LIB_PRIV@ +GLUT_PC_CFLAGS = @GLUT_PC_CFLAGS@ +GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@ +GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@ +GLW_PC_CFLAGS = @GLW_PC_CFLAGS@ +OSMESA_PC_REQ = @OSMESA_PC_REQ@ +OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@ diff --git a/configs/default b/configs/default index d3efc4b..1f340a3 100644 --- a/configs/default +++ b/configs/default @@ -116,3 +116,20 @@ DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) +# pkg-config substitutions +GL_PC_REQ_PRIV = +GL_PC_LIB_PRIV = +GL_PC_CFLAGS = +DRI_PC_REQ_PRIV = +GLU_PC_REQ = gl +GLU_PC_REQ_PRIV = +GLU_PC_LIB_PRIV = +GLU_PC_CFLAGS = +GLUT_PC_REQ_PRIV = +GLUT_PC_LIB_PRIV = +GLUT_PC_CFLAGS = +GLW_PC_REQ_PRIV = +GLW_PC_LIB_PRIV = +GLW_PC_CFLAGS = +OSMESA_PC_REQ = +OSMESA_PC_LIB_PRIV = |