diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2022-08-11 14:15:20 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2022-08-11 14:15:20 +0200 |
| commit | 4073749d3bd11d73290bc37904efd77b84272270 (patch) | |
| tree | 5a18e0a9384efe3c22299af865c714c48f5dafb3 | |
| parent | 2e684d2f4e663a5c7469d4b2b831b336af35126d (diff) | |
| download | tdv-4073749d3bd11d73290bc37904efd77b84272270.tar.gz tdv-4073749d3bd11d73290bc37904efd77b84272270.tar.xz tdv-4073749d3bd11d73290bc37904efd77b84272270.zip | |
Synchronize cross-compilation scripts
| -rw-r--r-- | README.adoc | 2 | ||||
| -rw-r--r-- | cmake/Win32CleanupAdwaita.sh | 6 | ||||
| -rw-r--r-- | cmake/Win64Depends.sh | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/README.adoc b/README.adoc index 9f53f01..2f928af 100644 --- a/README.adoc +++ b/README.adoc @@ -62,7 +62,7 @@ for Windows. It isn't particularly usable on that system, if only because selection watching is a very X11/Wayland-specific feature. Beware that build dependencies take up almost a gigabyte of disk space. - $ sh cmake/Win64Depends.sh + $ sh -e cmake/Win64Depends.sh $ cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Win64CrossToolchain.cmake \ -DCMAKE_BUILD_TYPE=Release -B build $ cmake --build build -- package diff --git a/cmake/Win32CleanupAdwaita.sh b/cmake/Win32CleanupAdwaita.sh index 8e7bb9e..ac2b032 100644 --- a/cmake/Win32CleanupAdwaita.sh +++ b/cmake/Win32CleanupAdwaita.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# Removes unused icons from the Adwaita theme, it could be even more aggressive, -# since it keeps around lots of sizes and all the GTK+ stock icons +# Removes unused icons from the Adwaita theme. It could be even more aggressive, +# since it keeps around lots of sizes and all the GTK+ stock icons. export LC_ALL=C find share/icons/Adwaita -type f | awk 'BEGIN { while (("grep -aho \"[a-z][a-z-]*\" *.dll *.exe" | getline) > 0) @@ -17,4 +17,4 @@ find share/icons/Adwaita -type f | awk 'BEGIN { sub(/-(ltr|rtl|symbolic)$/, "", base)) {} if (!keep) print -}' | xargs rm +}' | xargs rm -- diff --git a/cmake/Win64Depends.sh b/cmake/Win64Depends.sh index 9a13177..f9d33e9 100644 --- a/cmake/Win64Depends.sh +++ b/cmake/Win64Depends.sh @@ -1,5 +1,5 @@ #!/bin/sh -e -# Win64Depends.sh: download dependencies from MSYS2 for cross-compilation +# Win64Depends.sh: download dependencies from MSYS2 for cross-compilation. # Dependencies: AWK, sed, sha256sum, cURL, bsdtar, wine64 repository=https://repo.msys2.org/mingw/mingw64/ @@ -57,12 +57,12 @@ configure() { } # This directory name matches the prefix in .pc files, so we don't need to -# modify them (pkgconf has --prefix-variable, but CMake can't pass that option) +# modify them (pkgconf has --prefix-variable, but CMake can't pass that option). mkdir -p mingw64 cd mingw64 dbsync fetch mingw-w64-x86_64-gtk3 mingw-w64-x86_64-icu \ - mingw-w64-x86_64-libwinpthread-git # because we don't do "provides"? + mingw-w64-x86_64-libwinpthread-git # Because we don't do "provides"? verify extract configure |