File tree 2 files changed +6
-4
lines changed
2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change 17
17
matrix :
18
18
config :
19
19
- {os: macOS-latest, r: 'release'}
20
- - {os: windows-latest, r: 'release'}
21
20
- {os: windows-latest, r: 'devel'}
21
+ - {os: windows-latest, r: '4.1'}
22
+ - {os: windows-latest, r: '3.6'}
22
23
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
23
24
- {os: ubuntu-latest, r: 'release'}
24
25
- {os: ubuntu-latest, r: 'oldrel-1'}
Original file line number Diff line number Diff line change 1
- VERSION=21.04 .0
2
- DATA=0.4.10
1
+ VERSION=22.02 .0
2
+ DATA=0.4.11
3
3
4
4
# Need older poppler for R < 4.0
5
5
ifeq ($(R_COMPILED_BY),gcc 4.9.3)
6
6
VERSION=0.73.0
7
7
DATA=0.4.9
8
+ LIBHARFBUZZ=-lharfbuzz
8
9
endif
9
10
10
11
CXX_STD=CXX11
@@ -17,7 +18,7 @@ PKG_LIBS= \
17
18
-L$(RWINLIB)/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
18
19
-L$(RWINLIB)/lib${R_ARCH}${CRT} \
19
20
-lpoppler-cpp -lpoppler -llcms2 -ljpeg -lpng16 -ltiff -lopenjp2 \
20
- -lfreetype -lharfbuzz -lfreetype -lbz2 -liconv -lz
21
+ -lfreetype $(LIBHARFBUZZ) -lfreetype -lbz2 -liconv -lz
21
22
22
23
all: clean winlibs
23
24
You can’t perform that action at this time.
0 commit comments