Demos (master): egl/opengl: Fix X11 demo build.
Corbin Simpson
csimpson at kemper.freedesktop.org
Mon Jul 26 22:11:26 UTC 2010
Module: Demos
Branch: master
Commit: 1697ebd1d529fa747f4c42bbdf09463071cb2d08
URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=1697ebd1d529fa747f4c42bbdf09463071cb2d08
Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date: Mon Jul 26 14:45:18 2010 -0700
egl/opengl: Fix X11 demo build.
---
src/egl/opengl/Makefile.am | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am
index 4555450..35daba0 100644
--- a/src/egl/opengl/Makefile.am
+++ b/src/egl/opengl/Makefile.am
@@ -51,8 +51,6 @@ noinst_PROGRAMS = \
eglgears_screen \
egltri_screen \
peglgears \
- xeglgears \
- xeglthreads \
$(EGL_X11_DEMOS)
endif
@@ -62,6 +60,11 @@ eglgears_screen_SOURCES = eglgears.c
egltri_x11_SOURCES = egltri.c
eglgears_x11_SOURCES = eglgears.c
+eglgears_x11_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS)
+egltri_x11_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS)
+xeglgears_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS)
+xeglthreads_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS) -pthread
+
eglgears_screen_LDADD = ../eglut/libeglut_screen.la
egltri_screen_LDADD = ../eglut/libeglut_screen.la
More information about the mesa-commit
mailing list