continue

kvirc · Feb 16, 2024 · 0a1904d · 0a1904d
1 parent fa7a8b4
commit 0a1904d
Showing 1 changed file with 23 additions and 7 deletions.
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -58,6 +58,21 @@ jobs:
             openssl:x64-windows-release `
             zlib:x64-windows-release
 
+      - name: Install enchant
+        run: |
+          c:\msys64\usr\bin\pacman -Q
+          c:\msys64\usr\bin\pacman -S --noconfirm mingw64/mingw-w64-x86_64-enchant
+          mkdir c:\enchant-headers
+          copy c:\msys64\mingw64\lib\glib-2.0\include\glibconfig.h c:\enchant-headers
+          copy c:\msys64\mingw64\include\enchant-2\enchant.h c:\enchant-headers
+          cd c:\enchant-headers
+          c:\msys64\usr\bin\patch -p2 < ${{github.workspace}}\.appveyor.ench
+
+      - name: Patch Enchant for MSVC support
+        run: |
+          cd '${{github.workspace}}'
+          type .appveyor.perl >> c:\Strawberry\perl\lib\core\config.h
+
       - name: Patch Perl for MSVC support
         run: |
           # Strawberry perl doesn't support MSVC, but we force the support.
@@ -67,24 +82,21 @@ jobs:
       # missing:
       # https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md
       # enchant 2 and dictionaries
-      # perl (check prenistalled)
+      # perl (both strawberry and preistalled)
       # python (check preinstalled)
       # nsis
 
 
-      #-GNMake Makefiles
-      #-DCMAKE_VERBOSE_MAKEFILE=1
       #-DPERL_EXECUTABLE=c:/Strawberry/perl/bin/perl.exe
-      #-DEnchant_FOUND=1
-      #-DEnchant_INCLUDE_DIRS=c:/enchant-headers;$env:mingw_root/include/enchant-2;$env:mingw_root/include/glib-2.0
-      #-DEnchant_LDFLAGS=$env:mingw_root/lib/libenchant-2.dll.a
 
       - name: Configure CMake
         run: |
           cd '${{github.workspace}}'
           mkdir build
           cd build
           cmake .. `
+            -GNMake Makefiles
+            -DCMAKE_VERBOSE_MAKEFILE=1
             -DCMAKE_TOOLCHAIN_FILE="c:/vcpkg/scripts/buildsystems/vcpkg.cmake" `
             -DVCPKG_TARGET_TRIPLET=x64-windows-release `
             -DCMAKE_BUILD_TYPE=Release `
@@ -93,7 +105,11 @@ jobs:
             -DWANT_PERL=YES `
             -DWANT_PHONON=NO `
             -DWANT_PYTHON=YES `
-            -DWANT_QTWEBENGINE=NO
+            -DWANT_QTWEBENGINE=NO `
+            -DEnchant_FOUND=1 `
+            -DEnchant_INCLUDE_DIRS=c:/enchant-headers;c:/msys64/mingw64/include/enchant-2;c:/msys64/mingw64/include/glib-2.0 `
+            -DEnchant_LDFLAGS=c:/msys64/mingw64/lib/libenchant-2.dll.a
+
       - name: Build
         run: |
           cd '${{github.workspace}}'