vlc | branch: master | Niklas Haas <[email protected]> | Fri Oct 26 00:50:52 2018 +0200| [5c3794f317d8b03477865c8dbf84ad6e5393ea6c] | committer: Tristan Matthews
opengl: fix typo in makefile This doesn't break anything since the typo was reproduced everywhere it's used, but it's still worth fixing. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c3794f317d8b03477865c8dbf84ad6e5393ea6c --- modules/video_output/Makefile.am | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index a843882816..0b7c8dcf5b 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -8,7 +8,7 @@ OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \ video_output/opengl/internal.h video_output/opengl/fragment_shaders.c \ video_output/opengl/converter_sw.c -OPENGL_COMMONCLFAGS = $(LIBPLACEBO_CFLAGS) +OPENGL_COMMONCFLAGS = $(LIBPLACEBO_CFLAGS) OPENGL_COMMONLIBS = $(LIBPLACEBO_LIBS) if HAVE_DECKLINK @@ -24,13 +24,13 @@ libglconv_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' if HAVE_OSX libvout_macosx_plugin_la_SOURCES = video_output/macosx.m $(OPENGL_COMMONSOURCES) -libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) -DHAVE_GL_CORE_SYMBOLS +libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS) -DHAVE_GL_CORE_SYMBOLS libvout_macosx_plugin_la_LIBADD = $(OPENGL_COMMONLIBS) libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ -Wl,-framework,OpenGL,-framework,Cocoa libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m $(OPENGL_COMMONSOURCES) -libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) -DHAVE_GL_CORE_SYMBOLS +libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS) -DHAVE_GL_CORE_SYMBOLS libcaopengllayer_plugin_la_LIBADD = $(OPENGL_COMMONLIBS) libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore @@ -46,7 +46,7 @@ libglconv_cvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2 endif libvout_ios_plugin_la_SOURCES = video_output/ios.m $(OPENGL_COMMONSOURCES) -libvout_ios_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) -DUSE_OPENGL_ES2 +libvout_ios_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS) -DUSE_OPENGL_ES2 libvout_ios_plugin_la_LIBADD = $(OPENGL_COMMONLIBS) libvout_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ -Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit @@ -59,7 +59,7 @@ endif ### OpenGL ### libgles2_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c -libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 $(OPENGL_COMMONCLFAGS) +libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 $(OPENGL_COMMONCFLAGS) libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) $(OPENGL_COMMONLIBS) libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' @@ -67,7 +67,7 @@ EXTRA_LTLIBRARIES += libgles2_plugin.la vout_LTLIBRARIES += $(LTLIBgles2) libgl_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c -libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCLFAGS) +libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCFLAGS) libgl_plugin_la_LIBADD = $(LIBM) $(OPENGL_COMMONLIBS) if HAVE_WIN32 libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS @@ -332,8 +332,8 @@ libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ libglwin32_plugin_la_LIBADD = libchroma_copy.la -lopengl32 -lgdi32 $(LIBCOM) -luuid $(OPENGL_COMMONLIBS) libwgl_plugin_la_LIBADD = -lopengl32 -lgdi32 $(OPENGL_COMMONLIBS) -libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) -DHAVE_GL_CORE_SYMBOLS -libwgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) +libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS) -DHAVE_GL_CORE_SYMBOLS +libwgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS) libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libwgl_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
