From 04a31ef7b91c5898a099bed81f22722297b6f5d2 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Fri, 24 Apr 2020 22:57:54 +0200 Subject: [PATCH] Remove HIDPI_SUPPORT compilation flag We never need to build without HiDPI support. --- app/meson.build | 3 --- app/src/screen.c | 7 +++---- meson_options.txt | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/meson.build b/app/meson.build index 5d2b4caa..e59ce529 100644 --- a/app/meson.build +++ b/app/meson.build @@ -116,9 +116,6 @@ conf.set('DEFAULT_LOCK_VIDEO_ORIENTATION', '-1') # -1: unlocked # overridden by option --bit-rate conf.set('DEFAULT_BIT_RATE', '8000000') # 8Mbps -# enable High DPI support -conf.set('HIDPI_SUPPORT', get_option('hidpi_support')) - # disable console on Windows conf.set('WINDOWS_NOCONSOLE', get_option('windows_noconsole')) diff --git a/app/src/screen.c b/app/src/screen.c index 0af8de83..ff95c840 100644 --- a/app/src/screen.c +++ b/app/src/screen.c @@ -217,10 +217,9 @@ screen_init_rendering(struct screen *screen, const char *window_title, struct size window_size = get_initial_optimal_size(content_size, window_width, window_height); - uint32_t window_flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE; -#ifdef HIDPI_SUPPORT - window_flags |= SDL_WINDOW_ALLOW_HIGHDPI; -#endif + uint32_t window_flags = SDL_WINDOW_HIDDEN + | SDL_WINDOW_RESIZABLE + | SDL_WINDOW_ALLOW_HIGHDPI; if (always_on_top) { #ifdef SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP window_flags |= SDL_WINDOW_ALWAYS_ON_TOP; diff --git a/meson_options.txt b/meson_options.txt index c213e7dd..baa793d3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,5 @@ option('crossbuild_windows', type: 'boolean', value: false, description: 'Build option('windows_noconsole', type: 'boolean', value: false, description: 'Disable console on Windows (pass -mwindows flag)') option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server') option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable') -option('hidpi_support', type: 'boolean', value: true, description: 'Enable High DPI support') option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached') option('server_debugger_method', type: 'combo', choices: ['old', 'new'], value: 'new', description: 'Select the debugger method (Android < 9: "old", Android >= 9: "new")') -- GitLab