Demos (master): cygwin build fix for libutil dependency on GLUT

Jon TURNEY jturney at kemper.freedesktop.org
Tue Apr 26 03:06:25 PDT 2011


Module: Demos
Branch: master
Commit: 6a7bd134314e32ddd577c101520b3a54c9160dca
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=6a7bd134314e32ddd577c101520b3a54c9160dca

Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Mon Jun 21 18:30:06 2010 +0100

cygwin build fix for libutil dependency on GLUT

Set correct compiler/linker flags for libutil, so these are placed in
the .la file, so executables built later which are linked with libutil
are correctly linked on platforms which require things to be fully linked

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

---

 src/util/Makefile.am |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 5496c77..3456c90 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -30,6 +30,10 @@ AM_LDFLAGS = \
 noinst_LTLIBRARIES = libutil.la
 
 if HAVE_GLUT
+AM_CFLAGS += \
+	$(GLUT_CFLAGS)
+AM_LDFLAGS += \
+	$(GLUT_LIBS)
 SHADERUTIL_SRC = \
 	shaderutil.c \
 	shaderutil.h



More information about the mesa-commit mailing list