diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-10-05 13:59:55 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-11-27 18:42:19 +0000 |
| commit | 0ea374b1c78156f83a7544458dbd058c744deef3 (patch) | |
| tree | 902dbf12ce5f065812fd17d1b993a45e0d8b303f /player | |
| parent | 1b035402a688a5d116a9014e8930d7863481eeed (diff) | |
| download | mpv-0ea374b1c78156f83a7544458dbd058c744deef3.tar.bz2 mpv-0ea374b1c78156f83a7544458dbd058c744deef3.tar.xz | |
meson: generate .com in the same place as the .exe if possible
Meson was pretty strict about target ids and generating the mpv.com in
the same directory as mpv.exe wasn't possible. So as a workaround we
tucked it away in a subdirectory, but that's not really intuitive at
all. Well as of meson 1.3.0, this is now possible so leverage it since
it makes way more sense. We still keep the old workaround for anyone
using older meson versions.
Diffstat (limited to 'player')
| -rw-r--r-- | player/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/player/meson.build b/player/meson.build index dc334b8c96..be1e812d3e 100644 --- a/player/meson.build +++ b/player/meson.build @@ -1,10 +1,11 @@ subdir('javascript') subdir('lua') -# Meson doesn't allow having multiple build targets with the same name in the same file. -# Just generate the com in here for windows builds. -if win32 and get_option('cplayer') +# Older versions of meson don't allow multiple build targets with the same name in the same +# file. Generate it here for compatibility reasons for windows. +if win32 and get_option('cplayer') and meson.version().version_compare('< 1.3.0') wrapper_sources= '../osdep/win32-console-wrapper.c' executable('mpv', wrapper_sources, c_args: '-municode', link_args: '-municode', name_suffix: 'com', install: true) + warning('mpv.com executable will be generated in the player subdirectory.') endif |