Skip to content

Display and control your Android device

Move data/ to app/

Romain Vimont36c75e15b8e9
diff --git a/data/icon.ico b/app/data/icon.ico
similarity index 100%
rename from data/icon.ico
rename to app/data/icon.ico
diff --git a/data/icon.png b/app/data/icon.png
similarity index 100%
rename from data/icon.png
rename to app/data/icon.png
diff --git a/data/icon.svg b/app/data/icon.svg
similarity index 100%
rename from data/icon.svg
rename to app/data/icon.svg
diff --git a/data/open_a_terminal_here.bat b/app/data/open_a_terminal_here.bat
similarity index 100%
rename from data/open_a_terminal_here.bat
rename to app/data/open_a_terminal_here.bat
diff --git a/data/scrcpy-console.bat b/app/data/scrcpy-console.bat
similarity index 100%
rename from data/scrcpy-console.bat
rename to app/data/scrcpy-console.bat
diff --git a/data/scrcpy-noconsole.vbs b/app/data/scrcpy-noconsole.vbs
similarity index 100%
rename from data/scrcpy-noconsole.vbs
rename to app/data/scrcpy-noconsole.vbs
diff --git a/app/meson.build b/app/meson.build
index a0086619..6449439a 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -224,7 +224,7 @@ executable('scrcpy', src,
c_args: [])
install_man('scrcpy.1')
-install_data('../data/icon.png',
+install_data('data/icon.png',
rename: 'scrcpy.png',
install_dir: 'share/icons/hicolor/256x256/apps')
diff --git a/app/scrcpy-windows.rc b/app/scrcpy-windows.rc
index b130dc6a..dbd6aedb 100644
--- a/app/scrcpy-windows.rc
+++ b/app/scrcpy-windows.rc
@@ -1,6 +1,6 @@
#include <winuser.h>
-0 ICON "../data/icon.ico"
+0 ICON "data/icon.ico"
1 RT_MANIFEST "scrcpy-windows.manifest"
2 VERSIONINFO
BEGIN
diff --git a/release.mk b/release.mk
index 98b84a8e..caf6ab1a 100644
--- a/release.mk
+++ b/release.mk
@@ -98,10 +98,10 @@ dist-win32: build-server build-win32
mkdir -p "$(DIST)/$(WIN32_TARGET_DIR)"
cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
- cp data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)"
- 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 app/data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)"
+ cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)"
+ cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)"
+ cp app/data/open_a_terminal_here.bat "$(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)/"
@@ -117,10 +117,10 @@ dist-win64: build-server build-win64
mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
- cp data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)"
- 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 app/data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)"
+ cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)"
+ cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)"
+ cp app/data/open_a_terminal_here.bat "$(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)/"