From 257536103f807c52211a2dc330e4a2fff005e2ca Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 29 Mar 2019 11:03:07 -0400 Subject: [PATCH] Clean up specification of Windows dependency listp also suggested by TheQwertiest in freenode #mesonbuild. Also more TODOs. --- meson.build | 1 + windows/meson.build | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index dc0bbe84..a73009a2 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,7 @@ # MESONTODO figure out what (meson/ninja) dist do # MESONTODO figure out why test and examples aren't included in ninja all # MESONTODO figure out how to make an overarching "examples" target +# MESONTODO "cl : Command line warning D9038 : /ZI is not supported on this platform; enabling /Zi instead" # MESONTODOs from cmake; not sure if they're relevant here: # - uname -s for more refined OS control # - Haiku for haiku diff --git a/windows/meson.build b/windows/meson.build index cb43dc19..80c7bd82 100644 --- a/windows/meson.build +++ b/windows/meson.build @@ -74,13 +74,12 @@ if libui_mode == 'shared' libui_sources += [ windows.compile_resources('resources.rc', args: libui_manifest_args, - depend_files: ['libui.manifest'], + depend_files: ['libui.manifest']), ] endif # TODO prune this list -libui_winlibs = 'user32 kernel32 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid windowscodecs'.split(' ') -foreach lib : libui_winlibs +foreach lib : ['user32', 'kernel32', 'gdi32', 'comctl32', 'uxtheme', 'msimg32', 'comdlg32', 'd2d1', 'dwrite', 'ole32', 'oleaut32', 'oleacc', 'uuid', 'windowscodecs'] libui_deps += [ meson.get_compiler('cpp').find_library(lib, required: true),