Skip to content

Commit

Permalink
meson: move mpv.com target after mpv.exe to avoid meson version warning
Browse files Browse the repository at this point in the history
meson is able to detect blocks of code that are guarded with version
checks, but we did that in reverse order and mpv.exe was complaining.
  • Loading branch information
kasper93 authored and Dudemanguy committed Nov 27, 2023
1 parent facbbd1 commit aea8a82
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -1686,13 +1686,6 @@ features += {'libmpv-' + get_option('default_library'): get_option('libmpv')}

# build targets
if win32
# Older meson versions generate this in the player subdirectory.
if 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)
endif

windows = import('windows')
res_flags = ['--codepage=65001']

Expand Down Expand Up @@ -1768,6 +1761,13 @@ if get_option('cplayer')

mpv = executable('mpv', objects: libmpv.extract_all_objects(recursive: true), dependencies: dependencies,
win_subsystem: 'windows,6.0', install: true)

# Older meson versions generate this in the player subdirectory.
if win32 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)
endif
endif

if get_option('tests')
Expand Down

0 comments on commit aea8a82

Please sign in to comment.