~hp/nk_pugl

8547251d0980c43a06e1d801864c630f941a7c6d — Hanspeter Portner a month ago ffb11d0
Squashed 'subprojects/pugl/' changes from 8df91ca1..57801836

57801836 Fixes for static embedding
REVERT: 8df91ca1 Convert meson recipe to static linking

git-subtree-dir: subprojects/pugl
git-subtree-split: 57801836466e2432b146998320992696bc1a81ad
2 files changed, 26 insertions(+), 11 deletions(-)

M include/pugl/attributes.h
M meson.build
M include/pugl/attributes.h => include/pugl/attributes.h +1 -1
@@ 20,7 20,7 @@
#  elif defined(_WIN32) && !defined(PUGL_STATIC)
#    define PUGL_API __declspec(dllimport)
#  elif defined(__GNUC__)
#    define PUGL_API __attribute__((visibility("default")))
#    define PUGL_API __attribute__((visibility("hidden")))
#  else
#    define PUGL_API
#  endif

M meson.build => meson.build +25 -10
@@ 234,13 234,16 @@ common_sources = files(
  'src/internal.c',
)

libpugl = static_library(
libpugl = library(
  core_name,
  common_sources + platform_sources,
  c_args: library_args + core_args,
  dependencies: core_deps,
  gnu_symbol_visibility: 'hidden',
  include_directories: includes
  include_directories: includes,
  install: false,
  soversion: soversion,
  version: meson.project_version(),
)

pugl_dep = declare_dependency(


@@ 261,13 264,16 @@ if get_option('stub')
  name = 'pugl_' + platform + '_stub' + version_suffix
  sources = files('src/' + platform + '_stub' + extension)

  stub_backend = static_library(
  stub_backend = library(
    name,
    sources,
    c_args: library_args,
    dependencies: [pugl_dep],
    gnu_symbol_visibility: 'hidden',
    include_directories: includes
    include_directories: includes,
    install: false,
    soversion: soversion,
    version: meson.project_version(),
  )

  pugl_stub_dep = declare_dependency(


@@ 291,13 297,16 @@ if opengl_dep.found()
  name = 'pugl_' + platform + '_gl' + version_suffix
  sources = files('src/' + platform + '_gl' + extension)

  gl_backend = static_library(
  gl_backend = library(
    name,
    sources,
    c_args: library_args,
    dependencies: [pugl_dep, opengl_dep],
    gnu_symbol_visibility: 'hidden',
    include_directories: includes
    include_directories: includes,
    install: false,
    soversion: soversion,
    version: meson.project_version(),
  )

  pugl_gl_dep = declare_dependency(


@@ 332,14 341,17 @@ if cairo_dep.found()

  cairo_args = cc.get_supported_arguments(cairo_args)

  cairo_backend = static_library(
  cairo_backend = library(
    name,
    sources,
    c_args: library_args + cairo_args,
    dependencies: [pugl_dep, cairo_dep],
    gnu_symbol_visibility: 'hidden',
    include_directories: includes,
    objc_args: library_args + cairo_args
    install: false,
    objc_args: library_args + cairo_args,
    soversion: soversion,
    version: meson.project_version(),
  )

  pugl_cairo_dep = declare_dependency(


@@ 375,13 387,16 @@ if vulkan_dep.found()
    ]
  endif

  vulkan_backend = static_library(
  vulkan_backend = library(
    name,
    sources,
    c_args: library_args,
    dependencies: vulkan_deps,
    gnu_symbol_visibility: 'hidden',
    include_directories: includes
    include_directories: includes,
    install: false,
    soversion: soversion,
    version: meson.project_version(),
  )

  pugl_vulkan_dep = declare_dependency(