[vlc-devel] [PATCH] opengl: define HAVE_GL_CORE_SYMBOLS for the common code in Win32/OSX

[Steve Lhomme]

---
 modules/video_output/Makefile.am        | 4 +---
 modules/video_output/opengl/Makefile.am | 8 ++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 83fc2bf96ae..87cd6c8ae64 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -28,13 +28,11 @@ libglinterop_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 
 if HAVE_OSX
 libvout_macosx_plugin_la_SOURCES = video_output/macosx.m
-libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_GL_CORE_SYMBOLS
 libvout_macosx_plugin_la_LIBADD = libvlc_opengl.la
 libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,OpenGL,-framework,Cocoa
 
 libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m
-libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS)  -DHAVE_GL_CORE_SYMBOLS
 libcaopengllayer_plugin_la_LIBADD = libvlc_opengl.la
 libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore
@@ -151,7 +149,7 @@ libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 libglwin32_plugin_la_LIBADD = libchroma_copy.la -lopengl32 -lgdi32 $(LIBCOM) -luuid libvlc_opengl.la
 libwgl_plugin_la_LIBADD = -lopengl32 -lgdi32 libvlc_opengl.la
 
-libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS) -DHAVE_GL_CORE_SYMBOLS
+libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS)
 libwgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS)
 
 libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
diff --git a/modules/video_output/opengl/Makefile.am b/modules/video_output/opengl/Makefile.am
index a11bcdf3eef..738d957ad8a 100644
--- a/modules/video_output/opengl/Makefile.am
+++ b/modules/video_output/opengl/Makefile.am
@@ -27,7 +27,12 @@ libvlc_opengl_la_SOURCES = $(OPENGL_COMMONSOURCES)
 libvlc_opengl_la_CFLAGS = $(OPENGL_COMMONCFLAGS)
 libvlc_opengl_la_LIBADD = $(OPENGL_COMMONLIBS) $(LIBM)
 libvlc_opengl_la_LDFLAGS = -static -no-undefined
-
+if HAVE_OSX
+libvlc_opengl_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
+endif
+if HAVE_WIN32
+libvlc_opengl_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
+endif
 if HAVE_GL
 noinst_LTLIBRARIES += libvlc_opengl.la
 endif
@@ -57,7 +62,6 @@ libgl_plugin_la_SOURCES = video_output/opengl/display.c
 libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCFLAGS)
 libgl_plugin_la_LIBADD = libvlc_opengl.la
 if HAVE_WIN32
-libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
 libgl_plugin_la_LIBADD += $(GL_LIBS)
 endif
 
-- 
2.26.2