diff --git a/winbuild/build.rst b/winbuild/build.rst index 7493c30e5..b30a94226 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -55,8 +55,8 @@ behaviour of ``build_prepare.py``: * ``-v`` will print generated scripts. * ``--no-imagequant`` will skip GPL-licensed ``libimagequant`` optional dependency -* ``--no-raqm`` will skip optional dependency Raqm (which itself depends on - LGPL-licensed ``fribidi``). +* ``--no-fribidi`` or ``--no-raqm`` will skip optional LGPL-licensed dependency FriBiDi + (required for Raqm text shaping). * ``--python=`` and ``--executable=`` override ``PYTHON`` and ``EXECUTABLE``. * ``--architecture=`` overrides ``ARCHITECTURE``. * ``--dir=`` and ``--depends=`` override ``PILLOW_BUILD`` diff --git a/winbuild/raqm.cmake b/winbuild/raqm.cmake deleted file mode 100644 index 82c9cdc70..000000000 --- a/winbuild/raqm.cmake +++ /dev/null @@ -1,39 +0,0 @@ -cmake_minimum_required(VERSION 3.12) - -project(libraqm) - - -find_library(fribidi NAMES fribidi) -find_library(harfbuzz NAMES harfbuzz) -find_library(freetype NAMES freetype) - -add_definitions(-DFRIBIDI_LIB_STATIC) - - -function(raqm_conf) - file(READ configure.ac RAQM_CONF) - string(REGEX MATCH "\\[([0-9]+)\\.([0-9]+)\\.([0-9]+)\\]," _ "${RAQM_CONF}") - set(RAQM_VERSION_MAJOR "${CMAKE_MATCH_1}") - set(RAQM_VERSION_MINOR "${CMAKE_MATCH_2}") - set(RAQM_VERSION_MICRO "${CMAKE_MATCH_3}") - set(RAQM_VERSION "${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO}") - message("detected libraqm version ${RAQM_VERSION}") - configure_file(src/raqm-version.h.in src/raqm-version.h @ONLY) -endfunction() -raqm_conf() - - -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -set(RAQM_SOURCES - src/raqm.c) -set(RAQM_HEADERS - src/raqm.h - src/raqm-version.h) - -add_library(libraqm SHARED - ${RAQM_SOURCES} - ${RAQM_HEADERS}) -target_link_libraries(libraqm - ${fribidi} - ${harfbuzz} - ${freetype})