Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
    adapting to newer libfolia
    refactoring,  make more use of ticcutils goodies
    use more C++17 features
  • Loading branch information
kosloot committed Dec 5, 2024
1 parent fc88ce7 commit 9f375fb
Show file tree
Hide file tree
Showing 15 changed files with 359 additions and 411 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/foliautils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
branches:
- master
- actions
- develop

paths:
- configure.ac
Expand Down Expand Up @@ -48,10 +48,12 @@ jobs:

- uses: LanguageMachines/ticcactions/cpp-submodule-build@v1
with:
branch: ${{ github.ref_name }}
module: ticcutils

- uses: LanguageMachines/ticcactions/cpp-submodule-build@v1
with:
branch: ${{ github.ref_name }}
module: libfolia

- uses: LanguageMachines/ticcactions/cpp-submodule-build@v1
Expand All @@ -60,6 +62,7 @@ jobs:

- uses: LanguageMachines/ticcactions/cpp-submodule-build@v1
with:
branch: ${{ github.ref_name }}
module: ucto

- name: Static Code-check
Expand All @@ -76,3 +79,4 @@ jobs:
step: build
status: ${{ env.action_status }}
details: ${{ env.action_details }}
continue-on-error: true
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.6.16] )
CXXFLAGS="$CXXFLAGS $XML2_CFLAGS"
LIBS="$XML2_LIBS $LIBS"

PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.34] )
PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.36] )
CXXFLAGS="$ticcutils_CFLAGS $CXXFLAGS"
LIBS="$ticcutils_LIBS $LIBS"

PKG_CHECK_MODULES([ucto], [ucto >= 0.9.4] )
CXXFLAGS="$ucto_CFLAGS $CXXFLAGS"
LIBS="$ucto_LIBS $LIBS"

PKG_CHECK_MODULES([folia], [folia >= 2.19] )
PKG_CHECK_MODULES([folia], [folia >= 2.21] )
CXXFLAGS="$folia_CFLAGS $CXXFLAGS"
LIBS="$folia_LIBS $LIBS"

Expand Down
Loading

0 comments on commit 9f375fb

Please sign in to comment.