Skip to content

Commit

Permalink
Set icon and server env paths for meson devenv
Browse files Browse the repository at this point in the history
This allows users to compile and run the project in a dev environment.

    meson setup x
    meson compile -C x
    meson devenv -C x
    scrcpy

This is an alternative to `./run x`.

PR Genymobile#5658 <Genymobile#5658>

Signed-off-by: Romain Vimont <[email protected]>
  • Loading branch information
ColinKinloch authored and rom1v committed Dec 12, 2024
1 parent 17e205e commit ec4e826
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions app/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,9 @@ if get_option('buildtype') == 'debug'
test(t[0], exe)
endforeach
endif

if meson.version().version_compare('>= 0.58.0')
devenv = environment()
devenv.set('SCRCPY_ICON_PATH', meson.current_source_dir() / 'data/icon.png')
meson.add_devenv(devenv)
endif
6 changes: 6 additions & 0 deletions server/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ else
install: true,
install_dir: 'share/scrcpy')
endif

if meson.version().version_compare('>= 0.58.0')
devenv = environment()
devenv.set('SCRCPY_SERVER_PATH', meson.current_build_dir() / 'scrcpy-server')
meson.add_devenv(devenv)
endif

0 comments on commit ec4e826

Please sign in to comment.