From 8d583d36e259ba7f5f21d7a703cca73184200aa9 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Wed, 9 Feb 2022 23:10:38 +0100 Subject: [PATCH] Move prebuilt-deps/ to app/ The prebuilt dependencies are specific to the client app (not the server). This also avoids to reference the parent directory (../) from app/meson.build. --- app/meson.build | 10 ++-- .../prebuilt-deps}/.gitignore | 0 {prebuilt-deps => app/prebuilt-deps}/common | 0 .../prebuilt-deps}/prepare-adb.sh | 0 .../prebuilt-deps}/prepare-ffmpeg-win32.sh | 0 .../prebuilt-deps}/prepare-ffmpeg-win64.sh | 0 .../prebuilt-deps}/prepare-sdl.sh | 0 release.mk | 48 +++++++++---------- 8 files changed, 29 insertions(+), 29 deletions(-) rename {prebuilt-deps => app/prebuilt-deps}/.gitignore (100%) rename {prebuilt-deps => app/prebuilt-deps}/common (100%) rename {prebuilt-deps => app/prebuilt-deps}/prepare-adb.sh (100%) rename {prebuilt-deps => app/prebuilt-deps}/prepare-ffmpeg-win32.sh (100%) rename {prebuilt-deps => app/prebuilt-deps}/prepare-ffmpeg-win64.sh (100%) rename {prebuilt-deps => app/prebuilt-deps}/prepare-sdl.sh (100%) diff --git a/app/meson.build b/app/meson.build index 6557c3b8..123bcf62 100644 --- a/app/meson.build +++ b/app/meson.build @@ -111,9 +111,9 @@ if not crossbuild_windows else # cross-compile mingw32 build (from Linux to Windows) prebuilt_sdl2 = meson.get_cross_property('prebuilt_sdl2') - sdl2_bin_dir = meson.current_source_dir() + '/../prebuilt-deps/data/' + prebuilt_sdl2 + '/bin' - sdl2_lib_dir = meson.current_source_dir() + '/../prebuilt-deps/data/' + prebuilt_sdl2 + '/lib' - sdl2_include_dir = '../prebuilt-deps/data/' + prebuilt_sdl2 + '/include' + sdl2_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/bin' + sdl2_lib_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/lib' + sdl2_include_dir = 'prebuilt-deps/data/' + prebuilt_sdl2 + '/include' sdl2 = declare_dependency( dependencies: [ @@ -124,8 +124,8 @@ else ) prebuilt_ffmpeg = meson.get_cross_property('prebuilt_ffmpeg') - ffmpeg_bin_dir = meson.current_source_dir() + '/../prebuilt-deps/data/' + prebuilt_ffmpeg + '/bin' - ffmpeg_include_dir = '../prebuilt-deps/data/' + prebuilt_ffmpeg + '/include' + ffmpeg_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_ffmpeg + '/bin' + ffmpeg_include_dir = 'prebuilt-deps/data/' + prebuilt_ffmpeg + '/include' # ffmpeg versions are different for win32 and win64 builds ffmpeg_avcodec = meson.get_cross_property('ffmpeg_avcodec') diff --git a/prebuilt-deps/.gitignore b/app/prebuilt-deps/.gitignore similarity index 100% rename from prebuilt-deps/.gitignore rename to app/prebuilt-deps/.gitignore diff --git a/prebuilt-deps/common b/app/prebuilt-deps/common similarity index 100% rename from prebuilt-deps/common rename to app/prebuilt-deps/common diff --git a/prebuilt-deps/prepare-adb.sh b/app/prebuilt-deps/prepare-adb.sh similarity index 100% rename from prebuilt-deps/prepare-adb.sh rename to app/prebuilt-deps/prepare-adb.sh diff --git a/prebuilt-deps/prepare-ffmpeg-win32.sh b/app/prebuilt-deps/prepare-ffmpeg-win32.sh similarity index 100% rename from prebuilt-deps/prepare-ffmpeg-win32.sh rename to app/prebuilt-deps/prepare-ffmpeg-win32.sh diff --git a/prebuilt-deps/prepare-ffmpeg-win64.sh b/app/prebuilt-deps/prepare-ffmpeg-win64.sh similarity index 100% rename from prebuilt-deps/prepare-ffmpeg-win64.sh rename to app/prebuilt-deps/prepare-ffmpeg-win64.sh diff --git a/prebuilt-deps/prepare-sdl.sh b/app/prebuilt-deps/prepare-sdl.sh similarity index 100% rename from prebuilt-deps/prepare-sdl.sh rename to app/prebuilt-deps/prepare-sdl.sh diff --git a/release.mk b/release.mk index 755e94d4..aff9bd89 100644 --- a/release.mk +++ b/release.mk @@ -63,14 +63,14 @@ build-server: ninja -C "$(SERVER_BUILD_DIR)" prepare-deps-win32: - @prebuilt-deps/prepare-adb.sh - @prebuilt-deps/prepare-sdl.sh - @prebuilt-deps/prepare-ffmpeg-win32.sh + @app/prebuilt-deps/prepare-adb.sh + @app/prebuilt-deps/prepare-sdl.sh + @app/prebuilt-deps/prepare-ffmpeg-win32.sh prepare-deps-win64: - @prebuilt-deps/prepare-adb.sh - @prebuilt-deps/prepare-sdl.sh - @prebuilt-deps/prepare-ffmpeg-win64.sh + @app/prebuilt-deps/prepare-adb.sh + @app/prebuilt-deps/prepare-sdl.sh + @app/prebuilt-deps/prepare-ffmpeg-win64.sh build-win32: prepare-deps-win32 [ -d "$(WIN32_BUILD_DIR)" ] || ( mkdir "$(WIN32_BUILD_DIR)" && \ @@ -98,15 +98,15 @@ dist-win32: build-server build-win32 cp data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)" cp data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)" cp data/open_a_terminal_here.bat "$(DIST)/$(WIN32_TARGET_DIR)" - cp prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/platform-tools-31.0.3/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/platform-tools-31.0.3/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/platform-tools-31.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp prebuilt-deps/data/SDL2-2.0.20/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win32-4.3.1/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/platform-tools-31.0.3/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/SDL2-2.0.20/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/" dist-win64: build-server build-win64 mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)" @@ -116,15 +116,15 @@ dist-win64: build-server build-win64 cp data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)" cp data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)" cp data/open_a_terminal_here.bat "$(DIST)/$(WIN64_TARGET_DIR)" - cp prebuilt-deps/data/ffmpeg-win64-5.0/bin/avutil-57.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win64-5.0/bin/avcodec-59.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win64-5.0/bin/avformat-59.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win64-5.0/bin/swresample-4.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/ffmpeg-win64-5.0/bin/swscale-6.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/platform-tools-31.0.3/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/platform-tools-31.0.3/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/platform-tools-31.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp prebuilt-deps/data/SDL2-2.0.20/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win64-5.0/bin/avutil-57.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win64-5.0/bin/avcodec-59.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win64-5.0/bin/avformat-59.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win64-5.0/bin/swresample-4.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/ffmpeg-win64-5.0/bin/swscale-6.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/platform-tools-31.0.3/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/SDL2-2.0.20/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/" zip-win32: dist-win32 cd "$(DIST)/$(WIN32_TARGET_DIR)"; \