vlc | branch: master | Alexandre Janniaux <[email protected]> | Mon Apr 6 16:31:51 2020 +0200| [2c496f21633cb147bf6e302814e11b81e6477874] | committer: Alexandre Janniaux
vulkan: refactor Makefile.am for Vulkan plugins Much like video_output/xcb, gather all Vulkan-related plugins compilation targets in the vulkan subfolder, but still use the vout_LTLIBRARIES variable to enable targets. It doesn't move platform makefile rules which are in their respective window folder. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c496f21633cb147bf6e302814e11b81e6477874 --- modules/video_output/Makefile.am | 42 ++------------------------------- modules/video_output/vulkan/Makefile.am | 42 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index a61d15f20f..c82e9a0ed7 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -119,49 +119,11 @@ vout_LTLIBRARIES += libglinterop_vdpau_plugin.la endif endif # HAVE_GL -### Vulkan ### - -VULKAN_COMMONSOURCES = video_output/vulkan/instance.c \ - video_output/vulkan/instance.h \ - video_output/vulkan/platform.h \ - video_output/placebo_utils.c \ - video_output/placebo_utils.h - -# Trigger the c++ linker because of glslang dependency of libplacebo -VULKAN_COMMONSOURCES += dummy.cpp - -VULKAN_COMMONCFLAGS = $(VULKAN_CFLAGS) $(LIBPLACEBO_CFLAGS) -VULKAN_COMMONLIBS = $(VULKAN_LIBS) $(LIBPLACEBO_LIBS) - -libvk_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/display.c -libvk_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS) -libvk_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) - -libvk_win32_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/surface.c \ - video_output/vulkan/platform_win32.c -libvk_win32_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS) \ - -DVK_USE_PLATFORM_WIN32_KHR -DPLATFORM_NAME=Win32 -libvk_win32_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) - -libvk_android_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/surface.c \ - video_output/vulkan/platform_android.c -libvk_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS) \ - -DVK_USE_PLATFORM_ANDROID_KHR -DPLATFORM_NAME=Android -libvk_android_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) - -if HAVE_VULKAN -vout_LTLIBRARIES += libvk_plugin.la -if HAVE_WIN32_DESKTOP -vout_LTLIBRARIES += libvk_win32_plugin.la -endif -if HAVE_ANDROID -vout_LTLIBRARIES += libvk_android_plugin.la -endif -endif - ### X11 ### include video_output/xcb/Makefile.am +### Vulkan ### +include video_output/vulkan/Makefile.am ### Wayland ### include video_output/wayland/Makefile.am diff --git a/modules/video_output/vulkan/Makefile.am b/modules/video_output/vulkan/Makefile.am new file mode 100644 index 0000000000..5ab6eb6ee6 --- /dev/null +++ b/modules/video_output/vulkan/Makefile.am @@ -0,0 +1,42 @@ + +### Vulkan ### + +VULKAN_COMMONSOURCES = video_output/vulkan/instance.c \ + video_output/vulkan/instance.h \ + video_output/vulkan/platform.h \ + video_output/placebo_utils.c \ + video_output/placebo_utils.h + +# Trigger the c++ linker because of glslang dependency of libplacebo +VULKAN_COMMONSOURCES += dummy.cpp + +VULKAN_COMMONCFLAGS = $(VULKAN_CFLAGS) $(LIBPLACEBO_CFLAGS) +VULKAN_COMMONLIBS = $(VULKAN_LIBS) $(LIBPLACEBO_LIBS) + +libvk_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/display.c +libvk_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS) +libvk_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) + +libvk_win32_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/surface.c \ + video_output/vulkan/platform_win32.c +libvk_win32_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS) \ + -DVK_USE_PLATFORM_WIN32_KHR -DPLATFORM_NAME=Win32 +libvk_win32_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) + +libvk_android_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/surface.c \ + video_output/vulkan/platform_android.c +libvk_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS) \ + -DVK_USE_PLATFORM_ANDROID_KHR -DPLATFORM_NAME=Android +libvk_android_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) + +if HAVE_VULKAN +vout_LTLIBRARIES += libvk_plugin.la + +if HAVE_WIN32_DESKTOP +vout_LTLIBRARIES += libvk_win32_plugin.la +endif + +if HAVE_ANDROID +vout_LTLIBRARIES += libvk_android_plugin.la +endif +endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
