diff options
| author | Kristian Høgsberg <[email protected]> | 2010-05-02 09:51:13 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-05-02 09:51:13 -0400 |
| commit | 74399d4af5b5ea793ce8318c10014a026cf81563 (patch) | |
| tree | c7b16f93850b6b8114f37636767d6d22ecf4fee6 | |
| parent | a804af2a1ea184ecc2c6a5e77335fae1e7730242 (diff) | |
Add glesv2.pc and glesv1_cm.pc pkg-config files for ES 1 and 2
| -rw-r--r-- | configs/autoconf.in | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/mesa/Makefile | 28 |
3 files changed, 26 insertions, 7 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index afd51a370bb..57a681a717d 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -163,6 +163,8 @@ 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@ +GLESv1_CM_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@ +GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@ EGL_DRI2_CFLAGS = @EGL_DRI2_CFLAGS@ EGL_DRI2_LIBS = @EGL_DRI2_LIBS@ diff --git a/configure.ac b/configure.ac index 05cf6f82eb5..8e25163f75b 100644 --- a/configure.ac +++ b/configure.ac @@ -662,8 +662,9 @@ dri) GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" + GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" - + GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" ;; osmesa) # No libGL for osmesa diff --git a/src/mesa/Makefile b/src/mesa/Makefile index c0500630173..3ba7caa68a1 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -108,12 +108,15 @@ install: default esac ; \ done - -gl_pcedit = sed \ +pcedit = \ -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \ -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ + + +gl_pcedit = sed \ + $(pcedit) \ -e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \ -e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \ -e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \ @@ -122,11 +125,24 @@ gl_pcedit = sed \ gl.pc: gl.pc.in $(gl_pcedit) $< > $@ +glesv2_pcedit = sed \ + $(pcedit) \ + -e 's,@GLESv2_PC_LIB_PRIV@,$(GLESv2_PC_LIB_PRIV),' \ + -e 's,@GLESv2_LIB@,$(GLESv2_LIB),' + +glesv2.pc: glesv2.pc.in + $(glesv2_pcedit) $< > $@ + +glesv1_cm_pcedit = sed \ + $(pcedit) \ + -e 's,@GLESv1_CM_PC_LIB_PRIV@,$(GLESv1_CM_PC_LIB_PRIV),' \ + -e 's,@GLESv1_CM_LIB@,$(GLESv1_CM_LIB),' + +glesv1_cm.pc: glesv1_cm.pc.in + $(glesv1_cm_pcedit) $< > $@ + osmesa_pcedit = sed \ - -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ - -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \ - -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ + $(pcedit) \ -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \ -e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \ -e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),' |