[289/906] build fixes for Windows libraries

This commit is contained in:
David Schleef 2009-01-07 19:11:01 -08:00 committed by Matthew Waters
parent e141366934
commit e4b26b46fd
2 changed files with 3 additions and 5 deletions

View file

@ -2,7 +2,7 @@
lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la
libgstgl_@GST_MAJORMINOR@_la_SOURCES = \ libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
gstglwindow_x11.c \ gstglwindow_win32.c \
gstgldisplay.c \ gstgldisplay.c \
gstglbuffer.c \ gstglbuffer.c \
gstglfilter.c \ gstglfilter.c \
@ -19,7 +19,7 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \
libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) $(GST_LIBS) \ $(GST_BASE_LIBS) $(GST_LIBS) \
-lGLU -lGLEW $(GL_LIBS) $(X_LIBS) $(GL_LIBS)
libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \
$(GL_CFLAGS) $(X_CFLAGS) \ $(GL_CFLAGS) $(X_CFLAGS) \

View file

@ -71,9 +71,7 @@ libgstopengl_la_LIBADD = \
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \
-lGLEW \ $(GL_LIBS)
-lGLU \
-lGL
if HAVE_GDKPIXBUF if HAVE_GDKPIXBUF
libgstopengl_la_LIBADD += $(GDKPIXBUF_LIBS) libgstopengl_la_LIBADD += $(GDKPIXBUF_LIBS)
endif endif