Separate unix and windows in meson

This commit is contained in:
FlightlessMango 2020-09-05 07:42:39 +02:00
parent 6da5622002
commit b7aa6a997b
2 changed files with 124 additions and 101 deletions

View File

@ -30,9 +30,11 @@ else
endif
# TODO: this is very incomplete
is_unixy = false
if ['linux', 'cygwin', 'gnu'].contains(host_machine.system())
pre_args += '-D_GNU_SOURCE'
pre_args += '-DHAVE_PTHREAD'
is_unixy = true
endif
if get_option('glibcxx_asserts')
@ -77,9 +79,16 @@ endforeach
vulkan_wsi_args = []
vulkan_wsi_deps = []
dep_x11 = dependency('x11', required: get_option('with_x11'))
dep_wayland_client = dependency('wayland-client',
if is_unixy
dep_x11 = dependency('x11', required: get_option('with_x11'))
dep_wayland_client = dependency('wayland-client',
required: get_option('with_wayland'), version : '>=1.11')
dbus_dep = dependency('dbus-1', required: get_option('with_dbus')).partial_dependency(compile_args : true, includes : true)
else
dep_x11 = null_dep
dep_wayland_client = null_dep
dbus_dep = null_dep
endif
if dep_x11.found()
vulkan_wsi_args += ['-DVK_USE_PLATFORM_XLIB_KHR']
@ -90,7 +99,7 @@ if dep_wayland_client.found()
vulkan_wsi_deps += dep_wayland_client
endif
if not dep_x11.found() and not dep_wayland_client.found()
if is_unixy and not dep_x11.found() and not dep_wayland_client.found()
error('At least one of "with_x11" and "with_wayland" should be enabled')
endif
@ -100,7 +109,6 @@ inc_common = [
dep_vulkan = dependency('vulkan', required: get_option('use_system_vulkan'))
dep_pthread = dependency('threads')
dbus_dep = dependency('dbus-1', required: get_option('with_dbus')).partial_dependency(compile_args : true, includes : true)
# Check for generic C arguments
c_args = []
@ -157,10 +165,14 @@ foreach a : cpp_args
endforeach
# check for dl support
if cc.has_function('dlopen')
if is_unixy
if cc.has_function('dlopen')
dep_dl = null_dep
else
else
dep_dl = cc.find_library('dl')
endif
else
dep_dl = null_dep
endif
# check for linking with rt by default

View File

@ -26,7 +26,16 @@ foreach s : ['overlay.frag', 'overlay.vert']
command : [glslang, '-V', '-x', '-o', '@OUTPUT@', '@INPUT@'])
endforeach
vklayer_files = files(
vklayer_files = []
opengl_files = []
if ['windows', 'mingw'].contains(host_machine.system())
vklayer_files += files(
)
endif
if is_unixy
vklayer_files = files(
'overlay.cpp',
'overlay_params.cpp',
'font_unispace.c',
@ -42,37 +51,37 @@ vklayer_files = files(
'real_dlsym.cpp',
'pci_ids.cpp',
'logging.cpp',
)
)
opengl_files = files(
opengl_files = files(
'gl/glad.c',
'gl/imgui_impl_opengl3.cpp',
'gl/imgui_hud.cpp',
'gl/inject_egl.cpp',
)
)
if get_option('with_dlsym').enabled()
if get_option('with_dlsym').enabled()
pre_args += '-DHOOK_DLSYM'
endif
endif
nvml_h_found = get_option('with_nvml') == 'enabled'
if get_option('with_nvml') == 'system'
nvml_h_found = get_option('with_nvml') == 'enabled'
if get_option('with_nvml') == 'system'
nvml_h_found = cc.has_header('nvml.h')
if not nvml_h_found
error('nvml.h was not found. Disable with \'-Dwith_nvml=disabled\' if gpu stats by NVML is not needed.')
endif
pre_args += '-DUSE_SYSTEM_NVML'
endif
endif
if nvml_h_found
if nvml_h_found
pre_args += '-DHAVE_NVML'
vklayer_files += files(
'nvml.cpp',
'loaders/loader_nvml.cpp',
)
endif
endif
if get_option('with_xnvctrl').enabled()
if get_option('with_xnvctrl').enabled()
if not get_option('with_x11').enabled()
error('XNVCtrl also needs \'with_x11\'')
@ -88,9 +97,9 @@ if get_option('with_xnvctrl').enabled()
'loaders/loader_nvctrl.cpp',
'nvctrl.cpp',
)
endif
endif
if get_option('with_x11').enabled()
if get_option('with_x11').enabled()
pre_args += '-DHAVE_X11'
vklayer_files += files(
@ -102,14 +111,15 @@ if get_option('with_x11').enabled()
'loaders/loader_glx.cpp',
'gl/inject_glx.cpp',
)
endif
endif
if dbus_dep.found() and get_option('with_dbus').enabled()
if dbus_dep.found() and get_option('with_dbus').enabled()
pre_args += '-DHAVE_DBUS'
vklayer_files += files(
'dbus.cpp',
'loaders/loader_dbus.cpp',
)
endif
endif
link_args = cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro', '-Wl,--exclude-libs,ALL'])
@ -147,8 +157,8 @@ vklayer_mesa_overlay = shared_library(
install_dir : libdir_mangohud,
install : true
)
mangohud_dlsym = shared_library(
if is_unixy
mangohud_dlsym = shared_library(
'MangoHud_dlsym',
files(
'elfhacks.cpp',
@ -168,7 +178,8 @@ mangohud_dlsym = shared_library(
link_args : link_args,
install_dir : libdir_mangohud,
install : true
)
)
endif
configure_file(input : 'mangohud.json.in',
output : '@0@.json'.format(meson.project_name()),