From b777760bcac71f59797e69600448b814b215b618 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Sat, 8 Jun 2019 19:44:03 +0200 Subject: [PATCH] Simplify scrcpy-server path configuration 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. --- app/meson.build | 5 ----- app/src/server.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/meson.build b/app/meson.build index 7781d776..37e2372a 100644 --- a/app/meson.build +++ b/app/meson.build @@ -93,11 +93,6 @@ conf.set_quoted('SCRCPY_VERSION', meson.project_version()) # the prefix used during configuration (meson --prefix=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" # this is useful for building a "portable" version (with the server in the same # directory as the client) diff --git a/app/src/server.c b/app/src/server.c index 6c12ba99..6dbf6c76 100644 --- a/app/src/server.c +++ b/app/src/server.c @@ -15,7 +15,7 @@ #ifdef OVERRIDE_SERVER_PATH # define DEFAULT_SERVER_PATH OVERRIDE_SERVER_PATH #else -# define DEFAULT_SERVER_PATH PREFIX PREFIXED_SERVER_PATH +# define DEFAULT_SERVER_PATH PREFIX "/share/scrcpy/scrcpy-server.jar" #endif #define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"