diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f11a2e9..8fd3186 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: libuv-devel ` msys2-runtime-devel ` ninja - cp -r its C:/msys64/usr/share/gettext + cp -r windows-cross/its C:/msys64/usr/share/gettext Add-Content $env:GITHUB_PATH "C:/msys64/usr/bin" - name: Build @@ -76,7 +76,7 @@ jobs: mingw-w64-clang-aarch64-clang } mkdir -p C:/msys64/usr/share/gettext - cp -r its C:/msys64/usr/share/gettext + cp -r windows-cross/its C:/msys64/usr/share/gettext Add-Content $env:GITHUB_PATH "C:/msys64/clang64/bin" git apply --directory=fcitx5 patches/fcitx5.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index bea842b..6946a74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,9 +29,6 @@ if (CYGWIN) else() set(CMAKE_INSTALL_PREFIX C:) set(ENV{PKG_CONFIG_PATH} "${CMAKE_SYSROOT}/lib/pkgconfig") - set(ECM_DIR "${CMAKE_SYSROOT}/share/ECM/cmake") - set(GETTEXT_MSGMERGE_EXECUTABLE C:/msys64/usr/bin/msgmerge.exe) - set(GETTEXT_MSGFMT_EXECUTABLE C:/msys64/usr/bin/msgfmt.exe) endif() add_subdirectory(fcitx5) diff --git a/its/metainfo.its b/its/metainfo.its deleted file mode 100644 index 1e5bd9b..0000000 --- a/its/metainfo.its +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/its/metainfo.loc b/its/metainfo.loc deleted file mode 100644 index a7b4d8b..0000000 --- a/its/metainfo.loc +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/windows-cross b/windows-cross index 3743618..949e2c7 160000 --- a/windows-cross +++ b/windows-cross @@ -1 +1 @@ -Subproject commit 374361899383a38498c4a261847633799bc9c213 +Subproject commit 949e2c72b7fcbf2d7503a8506adda53a4d0a0a6e