Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Require Meson 0.37

Browse source 
Older versions of Meson are too limited, and it's simple to install a
newer version ("pip3 install meson").
This commit is contained in:
Romain Vimont 2018-02-14 13:37:01 +01:00
parent 4c49b27e9f
commit 0efa9305eb
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/meson.build
View file

@ -37,23 +37,25 @@ conf = configuration_data()
conf.set('BUILD_DEBUG', get_option('buildtype') == 'debug') conf.set('BUILD_DEBUG', get_option('buildtype') == 'debug')
# the version, updated on release # the version, updated on release
# (conf.set_quoted() is not available on old versions of meson) conf.set_quoted('SCRCPY_VERSION', '0.1')
conf.set('SCRCPY_VERSION', '"0.1"')
# the prefix used during configuration (meson --prefix=PREFIX) # the prefix used during configuration (meson --prefix=PREFIX)
conf.set('PREFIX', '"' + get_option('prefix') + '"') conf.set_quoted('PREFIX', get_option('prefix'))
# the path of the server, which will be appended to the prefix # the path of the server, which will be appended to the prefix
# ignored if OVERRIDE_SERVER_JAR if defined # ignored if OVERRIDE_SERVER_JAR if defined
# must be consistent with the install_dir in server/meson.build # must be consistent with the install_dir in server/meson.build
conf.set('PREFIXED_SERVER_JAR', '"/share/scrcpy/scrcpy-server.jar"') conf.set_quoted('PREFIXED_SERVER_JAR', '/share/scrcpy/scrcpy-server.jar')
# the path of the server to be used "as is" # the path of the server to be used "as is"
# this is useful for building a "portable" version (with the server in the same # this is useful for building a "portable" version (with the server in the same
# directory as the client) # directory as the client)
override_server_jar = get_option('override_server_jar') override_server_jar = get_option('override_server_jar')
if override_server_jar != '' if override_server_jar != ''
conf.set('OVERRIDE_SERVER_JAR', '"' + override_server_jar + '"') conf.set_quoted('OVERRIDE_SERVER_JAR', override_server_jar)
else
# undefine it
conf.set('OVERRIDE_SERVER_JAR', false)
endif endif
# the default client TCP port for the "adb reverse" tunnel # the default client TCP port for the "adb reverse" tunnel
@ -73,7 +75,7 @@ conf.set('DEFAULT_BIT_RATE', '4000000') # 4Mbps
# SKIP_FRAMES improves latency at the cost of framerate # SKIP_FRAMES improves latency at the cost of framerate
conf.set('SKIP_FRAMES', true) conf.set('SKIP_FRAMES', true)
configure_file(configuration: conf, input: 'src/config.h.in', output: 'config.h') configure_file(configuration: conf, output: 'config.h')
executable('scrcpy', src, dependencies: dependencies, install: true) executable('scrcpy', src, dependencies: dependencies, install: true)

9
app/src/config.h.in
View file

@ -1,9 +0,0 @@
#mesondefine BUILD_DEBUG
#mesondefine SCRCPY_VERSION
#mesondefine PREFIX
#mesondefine PREFIXED_SERVER_JAR
#mesondefine OVERRIDE_SERVER_JAR
#mesondefine DEFAULT_LOCAL_PORT
#mesondefine DEFAULT_MAX_SIZE
#mesondefine DEFAULT_BIT_RATE
#mesondefine SKIP_FRAMES

2
meson.build
View file

@ -1,4 +1,4 @@
project('scrcpy', 'c') project('scrcpy', 'c', meson_version: '>= 0.37')
if get_option('build_app') if get_option('build_app')
subdir('app') subdir('app')