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

Simplify scrcpy-server path configuration

Browse source 
The full path of scrcpy-server.jar was partially configured from
meson.build then concatenated by C code.

Instead, directly write the path in C.
This commit is contained in:
Romain Vimont 2019-06-08 19:44:03 +02:00
parent 72bdfbc7a6
commit b777760bca
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/meson.build
View file

@ -93,11 +93,6 @@ conf.set_quoted('SCRCPY_VERSION', meson.project_version())
# the prefix used during configuration (meson --prefix=PREFIX) # the prefix used during configuration (meson --prefix=PREFIX)
conf.set_quoted('PREFIX', get_option('prefix')) conf.set_quoted('PREFIX', get_option('prefix'))
# the path of the server, which will be appended to the prefix
# ignored if OVERRIDE_SERVER_PATH if defined
# must be consistent with the install_dir in server/meson.build
conf.set_quoted('PREFIXED_SERVER_PATH', '/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)

2
app/src/server.c
View file

@ -15,7 +15,7 @@
#ifdef OVERRIDE_SERVER_PATH #ifdef OVERRIDE_SERVER_PATH
# define DEFAULT_SERVER_PATH OVERRIDE_SERVER_PATH # define DEFAULT_SERVER_PATH OVERRIDE_SERVER_PATH
#else #else
# define DEFAULT_SERVER_PATH PREFIX PREFIXED_SERVER_PATH # define DEFAULT_SERVER_PATH PREFIX "/share/scrcpy/scrcpy-server.jar"
#endif #endif
#define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar" #define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"