From 2e684d2f4e663a5c7469d4b2b831b336af35126d Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Wed, 10 Aug 2022 16:04:10 +0200 Subject: Clean up cross-compilation --- cmake/Win64Depends.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cmake/Win64Depends.sh') diff --git a/cmake/Win64Depends.sh b/cmake/Win64Depends.sh index 25cab88..9a13177 100644 --- a/cmake/Win64Depends.sh +++ b/cmake/Win64Depends.sh @@ -54,13 +54,12 @@ configure() { glib-compile-schemas share/glib-2.0/schemas wine64 bin/gdk-pixbuf-query-loaders.exe \ > lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - - # pkgconf has a command line option for this, but CMake can't pass it - sed -i "s|^prefix=/mingw64|prefix=$(pwd)|" {share,lib}/pkgconfig/*.pc } -mkdir -p win32-depends -cd win32-depends +# 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) +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"? -- cgit v1.2.3-70-g09d2