Skip to content

Commit 8c2d71d

Browse files
plotnplotn
committed
merge with upstream, ext doc dialog 4
1 parent 419e187 commit 8c2d71d

File tree

15 files changed

+161
-183
lines changed

15 files changed

+161
-183
lines changed

‎android/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
55
package="org.coolreader"
66
android:installLocation="auto"
7-
android:versionName="3.2.38-1" android:versionCode="32380">
7+
android:versionName="3.2.39-1" android:versionCode="32390">
88
<supports-screens
99
android:xlargeScreens="true"
1010
android:largeScreens="true"

‎android/app/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ include_directories(${CR3_ROOT}/thirdparty/harfbuzz/src)
1818
include_directories(${CR3_ROOT}/thirdparty/libjpeg)
1919
include_directories(${CR3_ROOT}/thirdparty/antiword)
2020
include_directories(${CR3_ROOT}/thirdparty/chmlib/src)
21+
include_directories(${CR3_ROOT}/thirdparty/nanosvg/src)
2122

2223
add_definitions(-DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH)
2324
add_definitions(-DFT_CONFIG_MODULES_H=<builds/android/include/config/ftmodule.h> -DFT_CONFIG_OPTIONS_H=<builds/android/include/config/ftoption.h>)
@@ -26,6 +27,7 @@ add_definitions(-DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1)
2627
add_definitions(-DLDOM_USE_OWN_MEM_MAN=0)
2728
add_definitions(-DCR3_ANTIWORD_PATCH=1 -DENABLE_ANTIWORD=1)
2829
add_definitions(-DMAX_IMAGE_SCALE_MUL=2)
30+
add_definitions(-DUSE_NANOSVG=1)
2931

3032
#set(LOCAL_CFLAGS "-Wno-psabi -Wno-unused-variable -Wno-sign-compare -Wno-write-strings -Wno-main -Wno-unused-but-set-variable -Wno-unused-function -Wall")
3133
# Option '-Wl,--no-merge-exidx-entries' removed as incompatible with clang.
@@ -84,6 +86,7 @@ set(CRENGINE_SRC_FILES
8486
${CR3_ROOT}/crengine/src/wolutil.cpp
8587
${CR3_ROOT}/crengine/src/crconcurrent.cpp
8688
${CR3_ROOT}/crengine/src/hist.cpp
89+
${CR3_ROOT}/crengine/src/xxhash.c
8790
${CR3_ROOT}/crengine/src/private/lvfontglyphcache.cpp
8891
${CR3_ROOT}/crengine/src/private/lvfontboldtransform.cpp
8992
${CR3_ROOT}/crengine/src/private/lvfontcache.cpp

‎android/app/thirdparty_libs/freetype/Android.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
2626
$(FREETYPE_SRC_DIR)/src/base/ftglyph.c \
2727
$(FREETYPE_SRC_DIR)/src/base/ftbitmap.c \
2828
$(FREETYPE_SRC_DIR)/src/base/ftlcdfil.c \
29+
$(FREETYPE_SRC_DIR)/src/base/ftsynth.c \
2930
$(FREETYPE_SRC_DIR)/src/bdf/bdf.c \
3031
$(FREETYPE_SRC_DIR)/src/cache/ftcache.c \
3132
$(FREETYPE_SRC_DIR)/src/cff/cff.c \

‎android/app/thirdparty_libs/freetype/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ set(FREETYPE_SRC_FILES
1616
${FREETYPE_SRC_DIR}/src/base/ftglyph.c
1717
${FREETYPE_SRC_DIR}/src/base/ftbitmap.c
1818
${FREETYPE_SRC_DIR}/src/base/ftlcdfil.c
19+
${FREETYPE_SRC_DIR}/src/base/ftsynth.c
1920
${FREETYPE_SRC_DIR}/src/bdf/bdf.c
2021
${FREETYPE_SRC_DIR}/src/cache/ftcache.c
2122
${FREETYPE_SRC_DIR}/src/cff/cff.c

‎android/app/thirdparty_libs/harfbuzz/Android.mk‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ HARFBUZZ_CONFIG_DIR_P := $(LOCAL_PATH)
1313
LOCAL_C_INCLUDES := \
1414
$(HARFBUZZ_CONFIG_DIR_P) \
1515
$(HARFBUZZ_SRC_DIR_P) \
16-
$(HARFBUZZ_SRC_DIR_P)/src/hb-ucdn \
1716
$(FREETYPE_SRC_DIR_P) \
1817
$(FREETYPE_SRC_DIR_P)/include
1918

@@ -24,51 +23,49 @@ LOCAL_SRC_FILES := \
2423
$(HARFBUZZ_SRC_DIR)/src/hb-aat-layout.cc \
2524
$(HARFBUZZ_SRC_DIR)/src/hb-aat-map.cc \
2625
$(HARFBUZZ_SRC_DIR)/src/hb-blob.cc \
27-
$(HARFBUZZ_SRC_DIR)/src/hb-buffer.cc \
2826
$(HARFBUZZ_SRC_DIR)/src/hb-buffer-serialize.cc \
27+
$(HARFBUZZ_SRC_DIR)/src/hb-buffer.cc \
2928
$(HARFBUZZ_SRC_DIR)/src/hb-common.cc \
3029
$(HARFBUZZ_SRC_DIR)/src/hb-face.cc \
3130
$(HARFBUZZ_SRC_DIR)/src/hb-fallback-shape.cc \
3231
$(HARFBUZZ_SRC_DIR)/src/hb-font.cc \
33-
$(HARFBUZZ_SRC_DIR)/src/hb-ft.cc \
3432
$(HARFBUZZ_SRC_DIR)/src/hb-map.cc \
33+
$(HARFBUZZ_SRC_DIR)/src/hb-number.cc \
34+
$(HARFBUZZ_SRC_DIR)/src/hb-ot-cff1-table.cc \
35+
$(HARFBUZZ_SRC_DIR)/src/hb-ot-cff2-table.cc \
3536
$(HARFBUZZ_SRC_DIR)/src/hb-ot-color.cc \
3637
$(HARFBUZZ_SRC_DIR)/src/hb-ot-face.cc \
3738
$(HARFBUZZ_SRC_DIR)/src/hb-ot-font.cc \
3839
$(HARFBUZZ_SRC_DIR)/src/hb-ot-layout.cc \
3940
$(HARFBUZZ_SRC_DIR)/src/hb-ot-map.cc \
4041
$(HARFBUZZ_SRC_DIR)/src/hb-ot-math.cc \
42+
$(HARFBUZZ_SRC_DIR)/src/hb-ot-meta.cc \
43+
$(HARFBUZZ_SRC_DIR)/src/hb-ot-metrics.cc \
4144
$(HARFBUZZ_SRC_DIR)/src/hb-ot-name.cc \
42-
$(HARFBUZZ_SRC_DIR)/src/hb-ot-name-language.cc \
4345
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-arabic.cc \
4446
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-default.cc \
4547
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-hangul.cc \
4648
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-hebrew.cc \
47-
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic.cc \
4849
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic-table.cc \
50+
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic.cc \
4951
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-khmer.cc \
5052
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-myanmar.cc \
5153
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-thai.cc \
52-
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use.cc \
5354
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use-table.cc \
55+
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use.cc \
5456
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-vowel-constraints.cc \
5557
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-fallback.cc \
5658
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-normalize.cc \
5759
$(HARFBUZZ_SRC_DIR)/src/hb-ot-shape.cc \
5860
$(HARFBUZZ_SRC_DIR)/src/hb-ot-tag.cc \
5961
$(HARFBUZZ_SRC_DIR)/src/hb-ot-var.cc \
6062
$(HARFBUZZ_SRC_DIR)/src/hb-set.cc \
61-
$(HARFBUZZ_SRC_DIR)/src/hb-shape.cc \
6263
$(HARFBUZZ_SRC_DIR)/src/hb-shape-plan.cc \
64+
$(HARFBUZZ_SRC_DIR)/src/hb-shape.cc \
6365
$(HARFBUZZ_SRC_DIR)/src/hb-shaper.cc \
6466
$(HARFBUZZ_SRC_DIR)/src/hb-static.cc \
65-
$(HARFBUZZ_SRC_DIR)/src/hb-ucdn.cc \
67+
$(HARFBUZZ_SRC_DIR)/src/hb-ucd.cc \
6668
$(HARFBUZZ_SRC_DIR)/src/hb-unicode.cc \
67-
$(HARFBUZZ_SRC_DIR)/src/hb-warning.cc \
68-
$(HARFBUZZ_SRC_DIR)/src/hb-ucdn/ucdn.c
69-
# $(HARFBUZZ_SRC_DIR)/src/hb-subset-glyf.cc
70-
# $(HARFBUZZ_SRC_DIR)/src/hb-subset-input.cc
71-
# $(HARFBUZZ_SRC_DIR)/src/hb-subset.cc
72-
# $(HARFBUZZ_SRC_DIR)/src/hb-subset-plan.cc
69+
$(HARFBUZZ_SRC_DIR)/src/hb-ft.cc
7370

7471
include $(BUILD_STATIC_LIBRARY)

‎android/app/thirdparty_libs/harfbuzz/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,57 @@ set(HARFBUZZ_CONFIG_DIR ${PROJECT_SOURCE_DIR})
66

77
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
88
include_directories(${HARFBUZZ_CONFIG_DIR})
9-
include_directories(${HARFBUZZ_SRC_DIR}/src/hb-ucdn)
109

1110
add_definitions(-DHAVE_CONFIG_H=1)
1211

1312
set(HARFBUZZ_SRC_FILES
1413
${HARFBUZZ_SRC_DIR}/src/hb-aat-layout.cc
1514
${HARFBUZZ_SRC_DIR}/src/hb-aat-map.cc
1615
${HARFBUZZ_SRC_DIR}/src/hb-blob.cc
17-
${HARFBUZZ_SRC_DIR}/src/hb-buffer.cc
1816
${HARFBUZZ_SRC_DIR}/src/hb-buffer-serialize.cc
17+
${HARFBUZZ_SRC_DIR}/src/hb-buffer.cc
1918
${HARFBUZZ_SRC_DIR}/src/hb-common.cc
2019
${HARFBUZZ_SRC_DIR}/src/hb-face.cc
2120
${HARFBUZZ_SRC_DIR}/src/hb-fallback-shape.cc
2221
${HARFBUZZ_SRC_DIR}/src/hb-font.cc
23-
${HARFBUZZ_SRC_DIR}/src/hb-ft.cc
2422
${HARFBUZZ_SRC_DIR}/src/hb-map.cc
23+
${HARFBUZZ_SRC_DIR}/src/hb-number.cc
24+
${HARFBUZZ_SRC_DIR}/src/hb-ot-cff1-table.cc
25+
${HARFBUZZ_SRC_DIR}/src/hb-ot-cff2-table.cc
2526
${HARFBUZZ_SRC_DIR}/src/hb-ot-color.cc
2627
${HARFBUZZ_SRC_DIR}/src/hb-ot-face.cc
2728
${HARFBUZZ_SRC_DIR}/src/hb-ot-font.cc
2829
${HARFBUZZ_SRC_DIR}/src/hb-ot-layout.cc
2930
${HARFBUZZ_SRC_DIR}/src/hb-ot-map.cc
3031
${HARFBUZZ_SRC_DIR}/src/hb-ot-math.cc
32+
${HARFBUZZ_SRC_DIR}/src/hb-ot-meta.cc
33+
${HARFBUZZ_SRC_DIR}/src/hb-ot-metrics.cc
3134
${HARFBUZZ_SRC_DIR}/src/hb-ot-name.cc
32-
${HARFBUZZ_SRC_DIR}/src/hb-ot-name-language.cc
3335
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-arabic.cc
3436
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-default.cc
3537
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-hangul.cc
3638
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-hebrew.cc
37-
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-indic.cc
3839
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-indic-table.cc
40+
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-indic.cc
3941
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-khmer.cc
4042
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-myanmar.cc
4143
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-thai.cc
42-
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use.cc
4344
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use-table.cc
45+
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use.cc
4446
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-vowel-constraints.cc
4547
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-fallback.cc
4648
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-normalize.cc
4749
${HARFBUZZ_SRC_DIR}/src/hb-ot-shape.cc
4850
${HARFBUZZ_SRC_DIR}/src/hb-ot-tag.cc
4951
${HARFBUZZ_SRC_DIR}/src/hb-ot-var.cc
5052
${HARFBUZZ_SRC_DIR}/src/hb-set.cc
51-
${HARFBUZZ_SRC_DIR}/src/hb-shape.cc
5253
${HARFBUZZ_SRC_DIR}/src/hb-shape-plan.cc
54+
${HARFBUZZ_SRC_DIR}/src/hb-shape.cc
5355
${HARFBUZZ_SRC_DIR}/src/hb-shaper.cc
5456
${HARFBUZZ_SRC_DIR}/src/hb-static.cc
55-
${HARFBUZZ_SRC_DIR}/src/hb-ucdn.cc
57+
${HARFBUZZ_SRC_DIR}/src/hb-ucd.cc
5658
${HARFBUZZ_SRC_DIR}/src/hb-unicode.cc
57-
${HARFBUZZ_SRC_DIR}/src/hb-warning.cc
58-
59-
${HARFBUZZ_SRC_DIR}/src/hb-ucdn/ucdn.c
59+
${HARFBUZZ_SRC_DIR}/src/hb-ft.cc
6060
)
6161
# ${HARFBUZZ_SRC_DIR}/src/hb-subset-glyf.cc
6262
# ${HARFBUZZ_SRC_DIR}/src/hb-subset-input.cc

‎android/app/thirdparty_libs/harfbuzz/config.h‎

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
/* Have Core Text backend */
1717
/* #undef HAVE_CORETEXT */
1818

19-
/* Define to 1 if you have the declaration of `round', and to 0 if you don't.
20-
*/
21-
/* #undef HAVE_DECL_ROUND */
19+
/* define if the compiler supports basic C++11 syntax */
20+
#define HAVE_CXX11 1
2221

2322
/* Have DirectWrite library */
2423
/* #undef HAVE_DIRECTWRITE */
@@ -29,9 +28,6 @@
2928
/* Define to 1 if you have the <dwrite.h> header file. */
3029
/* #undef HAVE_DWRITE_H */
3130

32-
/* Have simple TrueType Layout backend */
33-
#define HAVE_FALLBACK 1
34-
3531
/* Have fontconfig library */
3632
/* #undef HAVE_FONTCONFIG */
3733

@@ -47,6 +43,9 @@
4743
/* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */
4844
/* #undef HAVE_FT_SET_VAR_BLEND_COORDINATES */
4945

46+
/* Have GDI library */
47+
/* #undef HAVE_GDI */
48+
5049
/* Define to 1 if you have the `getpagesize' function. */
5150
/* #undef HAVE_GETPAGESIZE */
5251

@@ -86,17 +85,14 @@
8685
/* Define to 1 if you have the `newlocale' function. */
8786
/* #undef HAVE_NEWLOCALE */
8887

89-
/* Define to 1 if you have the `posix_memalign' function. */
90-
/* #undef HAVE_POSIX_MEMALIGN */
91-
9288
/* Have POSIX threads */
9389
#define HAVE_PTHREAD 1
9490

9591
/* Have PTHREAD_PRIO_INHERIT. */
9692
#define HAVE_PTHREAD_PRIO_INHERIT 1
9793

98-
/* Define to 1 if you have the `round' function. */
99-
#define HAVE_ROUND 1
94+
/* Define to 1 if you have the `roundf' function. */
95+
/* #undef HAVE_ROUNDF */
10096

10197
/* Define to 1 if you have the <sched.h> header file. */
10298
/* #undef HAVE_SCHED_H */
@@ -137,9 +133,6 @@
137133
/* Define to 1 if you have the <sys/types.h> header file. */
138134
#define HAVE_SYS_TYPES_H 1
139135

140-
/* Have UCDN Unicode functions */
141-
#define HAVE_UCDN 1
142-
143136
/* Have Uniscribe library */
144137
/* #undef HAVE_UNISCRIBE */
145138

@@ -165,7 +158,7 @@
165158
#define PACKAGE_NAME "HarfBuzz"
166159

167160
/* Define to the full name and version of this package. */
168-
#define PACKAGE_STRING "HarfBuzz 2.2.0"
161+
#define PACKAGE_STRING "HarfBuzz 2.6.4"
169162

170163
/* Define to the one symbol short name of this package. */
171164
#define PACKAGE_TARNAME "harfbuzz"
@@ -174,7 +167,7 @@
174167
#define PACKAGE_URL "http://harfbuzz.org/"
175168

176169
/* Define to the version of this package. */
177-
#define PACKAGE_VERSION "2.2.0"
170+
#define PACKAGE_VERSION "2.6.4"
178171

179172
/* Define to necessary symbol if this constant uses a non-standard name on
180173
your system. */
@@ -183,28 +176,6 @@
183176
/* Define to 1 if you have the ANSI C header files. */
184177
#define STDC_HEADERS 1
185178

186-
/* Enable extensions on AIX 3, Interix. */
187-
#ifndef _ALL_SOURCE
188-
# define _ALL_SOURCE 1
189-
#endif
190-
/* Enable GNU extensions on systems that have them. */
191-
#ifndef _GNU_SOURCE
192-
# define _GNU_SOURCE 1
193-
#endif
194-
/* Enable threading extensions on Solaris. */
195-
#ifndef _POSIX_PTHREAD_SEMANTICS
196-
# define _POSIX_PTHREAD_SEMANTICS 1
197-
#endif
198-
/* Enable extensions on HP NonStop. */
199-
#ifndef _TANDEM_SOURCE
200-
# define _TANDEM_SOURCE 1
201-
#endif
202-
/* Enable general extensions on Solaris. */
203-
#ifndef __EXTENSIONS__
204-
# define __EXTENSIONS__ 1
205-
#endif
206-
207-
208179
/* Enable large inode numbers on Mac OS X 10.5. */
209180
#ifndef _DARWIN_USE_64_BIT_INODE
210181
# define _DARWIN_USE_64_BIT_INODE 1
@@ -215,13 +186,3 @@
215186

216187
/* Define for large files, on AIX-style hosts. */
217188
/* #undef _LARGE_FILES */
218-
219-
/* Define to 1 if on MINIX. */
220-
/* #undef _MINIX */
221-
222-
/* Define to 2 if the system does not provide POSIX.1 features except with
223-
this defined. */
224-
/* #undef _POSIX_1_SOURCE */
225-
226-
/* Define to 1 if you need to in order for `stat' and other things to work. */
227-
/* #undef _POSIX_SOURCE */

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
maven { url "https://jitpack.io" }
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.0-rc02'
11+
classpath 'com.android.tools.build:gradle:3.6.0-rc03'
1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
1414
}

‎cmake/modules/FindHarfBuzz.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
# HARFBUZZ_LIBRARY - HarfBuzz library
1313
# HARFBUZZ_LIBRARIES - Same as HARFBUZZ_LIBRARY
14-
# HARFBUZZ_INCLUDE_DIR - Include dir
14+
# HARFBUZZ_INCLUDE_DIRS - Include dir
1515
#
1616

1717
#
@@ -43,24 +43,24 @@
4343
find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
4444

4545
# Include dir
46-
find_path(HARFBUZZ_INCLUDE_DIR
46+
find_path(HARFBUZZ_INCLUDE_DIRS
4747
NAMES hb.h
4848
PATH_SUFFIXES harfbuzz)
4949

5050
include(FindPackageHandleStandardArgs)
5151
find_package_handle_standard_args(HarfBuzz DEFAULT_MSG
5252
HARFBUZZ_LIBRARY
53-
HARFBUZZ_INCLUDE_DIR)
53+
HARFBUZZ_INCLUDE_DIRS)
5454

5555
mark_as_advanced(FORCE
5656
HARFBUZZ_LIBRARY
57-
HARFBUZZ_INCLUDE_DIR)
57+
HARFBUZZ_INCLUDE_DIRS)
5858

5959
if(NOT TARGET HarfBuzz::HarfBuzz)
6060
add_library(HarfBuzz::HarfBuzz UNKNOWN IMPORTED)
6161
set_target_properties(HarfBuzz::HarfBuzz PROPERTIES
6262
IMPORTED_LOCATION ${HARFBUZZ_LIBRARY}
63-
INTERFACE_INCLUDE_DIRECTORIES ${HARFBUZZ_INCLUDE_DIR})
63+
INTERFACE_INCLUDE_DIRECTORIES ${HARFBUZZ_INCLUDE_DIRS})
6464
endif()
6565

6666
set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})

‎cr3gui/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ elseif (${GUI} STREQUAL CRGUI_PB)
196196
FILES_MATCHING PATTERN "*.pdb" )
197197
INSTALL( DIRECTORY data/hyph/ DESTINATION system/share/cr3/hyph
198198
FILES_MATCHING PATTERN "*.pattern" )
199+
INSTALL( DIRECTORY data/hyph/ DESTINATION system/share/cr3/hyph
200+
FILES_MATCHING PATTERN "*.json" )
199201
INSTALL( DIRECTORY data/devices/${DEVICE_NAME}/skins/default/ DESTINATION system/share/cr3/skin )
200202
INSTALL( DIRECTORY data/devices/${DEVICE_NAME}/keymaps/ DESTINATION system/share/cr3/keymaps )
201203
INSTALL( DIRECTORY data/manual/ DESTINATION system/share/cr3/manual )

0 commit comments

Comments
 (0)