Skip to content

Display and control your Android device

Rename "build_" to "compile_"

Romain Vimont02692ffa42c6
diff --git a/Makefile.CrossWindows b/Makefile.CrossWindows
index 7955c544..49adcfb7 100644
--- a/Makefile.CrossWindows
+++ b/Makefile.CrossWindows
@@ -44,7 +44,7 @@ clean:
build-server:
[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \
meson "$(SERVER_BUILD_DIR)" \
- --buildtype release -Dbuild_app=false )
+ --buildtype release -Dcompile_app=false )
ninja -C "$(SERVER_BUILD_DIR)"
prepare-deps-win32:
@@ -56,7 +56,7 @@ build-win32: prepare-deps-win32
--cross-file cross_win32.txt \
--buildtype release --strip -Db_lto=true \
-Dcrossbuild_windows=true \
- -Dbuild_server=false \
+ -Dcompile_server=false \
-Dportable=true )
ninja -C "$(WIN32_BUILD_DIR)"
@@ -66,7 +66,7 @@ build-win32-noconsole: prepare-deps-win32
--cross-file cross_win32.txt \
--buildtype release --strip -Db_lto=true \
-Dcrossbuild_windows=true \
- -Dbuild_server=false \
+ -Dcompile_server=false \
-Dwindows_noconsole=true \
-Dportable=true )
ninja -C "$(WIN32_NOCONSOLE_BUILD_DIR)"
@@ -80,7 +80,7 @@ build-win64: prepare-deps-win64
--cross-file cross_win64.txt \
--buildtype release --strip -Db_lto=true \
-Dcrossbuild_windows=true \
- -Dbuild_server=false \
+ -Dcompile_server=false \
-Dportable=true )
ninja -C "$(WIN64_BUILD_DIR)"
@@ -90,7 +90,7 @@ build-win64-noconsole: prepare-deps-win64
--cross-file cross_win64.txt \
--buildtype release --strip -Db_lto=true \
-Dcrossbuild_windows=true \
- -Dbuild_server=false \
+ -Dcompile_server=false \
-Dwindows_noconsole=true \
-Dportable=true )
ninja -C "$(WIN64_NOCONSOLE_BUILD_DIR)"
diff --git a/meson.build b/meson.build
index 053d8c94..bdd4a879 100644
--- a/meson.build
+++ b/meson.build
@@ -3,11 +3,11 @@ project('scrcpy', 'c',
meson_version: '>= 0.37',
default_options: 'c_std=c11')
-if get_option('build_app')
+if get_option('compile_app')
subdir('app')
endif
-if get_option('build_server')
+if get_option('compile_server')
subdir('server')
endif
diff --git a/meson_options.txt b/meson_options.txt
index e832fafd..d93161e3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
-option('build_app', type: 'boolean', value: true, description: 'Build the client')
-option('build_server', type: 'boolean', value: true, description: 'Build the server')
+option('compile_app', type: 'boolean', value: true, description: 'Build the client')
+option('compile_server', type: 'boolean', value: true, description: 'Build the server')
option('crossbuild_windows', type: 'boolean', value: false, description: 'Build for Windows from Linux')
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')