projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 06fff29)
osmesa: fix out-of-tree build
authorAndreas Boll <andreas.boll.dev@gmail.com>
Sat, 16 Mar 2013 13:00:44 +0000 (14:00 +0100)
committerAndreas Boll <andreas.boll.dev@gmail.com>
Tue, 19 Mar 2013 17:12:38 +0000 (18:12 +0100)
Taken from downstream:
http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/mesa.git;a=blob;f=debian/patches/14-fix-osmesa-build.diff;h=00581d0e1833c5492d9050e1bf3d5e658cad782e;hb=refs/heads/ubuntu%2B1

v2: Move the added line immediately after -I$(top_srcdir)/src/mapi

NOTE: This is a candidate for the 9.1 and 9.0 branches.

Acked-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
Reviewed-by: Matt Turner <mattst88@gmail.com>
src/mesa/drivers/osmesa/Makefile.am patch | blob | history

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index c4b178b749505bbb0cf838144430c979b5f245e0..250340146c00429d4459577985a6d67348da898e 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -24,6 +24,7 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
        $(DEFINES) \
        $(API_DEFINES)