diff --git a/Common/3dParty/brotli/.gitignore b/Common/3dParty/brotli/.gitignore new file mode 100644 index 0000000000..f5860a1130 --- /dev/null +++ b/Common/3dParty/brotli/.gitignore @@ -0,0 +1,2 @@ +brotli/ +module.version diff --git a/Common/3dParty/brotli/brotli.pri b/Common/3dParty/brotli/brotli.pri new file mode 100644 index 0000000000..a136517bf9 --- /dev/null +++ b/Common/3dParty/brotli/brotli.pri @@ -0,0 +1,9 @@ +SRC_DIR = $$PWD/brotli/c +DEFINES += FT_CONFIG_OPTION_USE_BROTLI + +INCLUDEPATH += \ + $$SRC_DIR/include + +SOURCES += $$files($$SRC_DIR/common/*.c) +SOURCES += $$files($$SRC_DIR/dec/*.c) +#SOURCES += $$files($$SRC_DIR/enc/*.c) diff --git a/Common/3dParty/brotli/make.py b/Common/3dParty/brotli/make.py new file mode 100644 index 0000000000..8101fec5e0 --- /dev/null +++ b/Common/3dParty/brotli/make.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python + +import sys +import os +sys.path.append("../../../../build_tools/scripts") +import base + +def clear_module(): + if base.is_dir("brotli"): + base.delete_dir_with_access_error("brotli") + return + +base.check_module_version("1", clear_module) + +# fetch harfbuzz +if not base.is_dir("brotli"): + base.cmd("git", ["clone", "https://github.com/google/brotli.git"]) + os.chdir("brotli") + base.cmd("git", ["checkout", "a47d7475063eb223c87632eed806c0070e70da29"]) + os.chdir("../") diff --git a/DesktopEditor/fontengine/js/libfont.json b/DesktopEditor/fontengine/js/libfont.json index 49cdc8d629..7585d300a1 100644 --- a/DesktopEditor/fontengine/js/libfont.json +++ b/DesktopEditor/fontengine/js/libfont.json @@ -83,6 +83,7 @@ "./../../graphics/pro/js/wasm/src/lib", "./../../../Common/3dParty/harfbuzz/harfbuzz/src", + "./../../../Common/3dParty/brotli/brotli/c/include", "./../../../OfficeUtils/src", "./../../../OfficeUtils/src/zlib-1.2.11", @@ -113,6 +114,8 @@ "BUILD_ZLIB_AS_SOURCES", "IMAGE_CHECKER_DISABLE_XML", + "FT_CONFIG_OPTION_USE_BROTLI", + "BUILDING_WASM_MODULE" ], "compile_files_array": [ @@ -349,6 +352,26 @@ { "folder": "./../../../Common/3dParty/hyphen/js/src", "files": ["hyphen.cpp"] + }, + { + "folder": "./../../../Common/3dParty/brotli/brotli/c/common", + "files": [ + "constants.c", + "context.c", + "dictionary.c", + "platform.c", + "shared_dictionary.c", + "transform.c" + ] + }, + { + "folder": "./../../../Common/3dParty/brotli/brotli/c/dec", + "files": [ + "bit_reader.c", + "decode.c", + "huffman.c", + "state.c" + ] } ] } diff --git a/DesktopEditor/graphics/pro/fontengine.pri b/DesktopEditor/graphics/pro/fontengine.pri index 9e84f6130c..c562a1ba87 100644 --- a/DesktopEditor/graphics/pro/fontengine.pri +++ b/DesktopEditor/graphics/pro/fontengine.pri @@ -38,6 +38,10 @@ enable_support_shaper { } # ------------------------------------------------- +# ------------------- brotli ---------------------- +include($$PWD/../../../Common/3dParty/brotli/brotli.pri) +# ------------------------------------------------- + # ------------------- hyphen ---------------------- HEADERS += $$FONT_ENGINE_PATH/languages.h diff --git a/PdfFile/PdfFile.pro b/PdfFile/PdfFile.pro index 92769f4113..19a68e524b 100644 --- a/PdfFile/PdfFile.pro +++ b/PdfFile/PdfFile.pro @@ -128,6 +128,7 @@ core_windows { DEFINES -= _UNICODE } +include($$PWD/../3dParty/brotli/brotli.pri) include($$PWD/../DesktopEditor/graphics/pro/freetype.pri) HEADERS += \