Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
/raggPublic

Commit35982b7

Browse files
authored
Use libs from Rtools if found (#178)
1 parent6e8bfd1 commit35982b7

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

‎.github/workflows/R-CMD-check.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
matrix:
2424
config:
2525
-{os: macos-latest, r: 'release'}
26-
-{os: windows-latest, r: 'release'}
26+
-{os: windows-latest, r: 'devel'}
27+
-{os: windows-latest, r: '4.4'}
28+
-{os: windows-latest, r: '4.3'}
2729
-{os: windows-latest, r: '4.2'}
2830
-{os: windows-latest, r: '4.1'}
2931
-{os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}

‎src/Makevars.win‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,35 @@
1+
PKG_CONFIG_NAME = freetype2 libpng libtiff-4 libjpeg
2+
PKG_CONFIG ?= $(BINPREF)pkg-config
3+
RAGG_LIBS := $(shell $(PKG_CONFIG) --libs $(PKG_CONFIG_NAME))
4+
5+
ifneq ($(RAGG_LIBS),)
6+
$(info using $(PKG_CONFIG_NAME) from Rtools)
7+
RAGG_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(PKG_CONFIG_NAME))
8+
else
19
RWINLIB = ../windows/harfbuzz
10+
RAGG_CFLAGS = -I$(RWINLIB)/include -I$(RWINLIB)/include/freetype2
11+
RAGG_LIBS = -L$(RWINLIB)/lib$(R_ARCH) -L$(RWINLIB)/lib -lfreetype -lharfbuzz -lfreetype -lpng -lz -ltiff -ljpeg -lbz2 -lrpcrt4 -lgdi32 -lws2_32
12+
endif
13+
14+
PKG_LIBS = -Lagg -lstatagg $(RAGG_LIBS)
15+
PKG_CPPFLAGS = -DSTRICT_R_HEADERS -I./agg/include $(RAGG_CFLAGS)
216

317
AGG_OBJECTS = agg/src/agg_curves.o agg/src/agg_font_freetype.o \
418
agg/src/agg_image_filters.o agg/src/agg_trans_affine.o \
519
agg/src/agg_vcgen_dash.o agg/src/agg_vcgen_stroke.o
620

7-
PKG_CPPFLAGS = -DSTRICT_R_HEADERS \
8-
-I$(RWINLIB)/include -I$(RWINLIB)/include/freetype2 \
9-
-I./agg/include \
10-
11-
PKG_LIBS = -Lagg -lstatagg \
12-
-L$(RWINLIB)/lib$(R_ARCH) -L$(RWINLIB)/lib \
13-
-lfreetype -lharfbuzz -lfreetype -lpng -lz -ltiff -ljpeg \
14-
-lbz2 -lrpcrt4 -lgdi32 -lws2_32
15-
1621
STATLIB = agg/libstatagg.a
1722

18-
all:clean winlibs
23+
all:$(SHLIB)
1924

2025
$(SHLIB): $(STATLIB)
2126

2227
$(STATLIB): $(AGG_OBJECTS)
2328

24-
winlibs:
29+
$(OBJECTS): $(RWINLIB)
30+
31+
$(RWINLIB):
2532
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
2633

2734
clean:
28-
rm -f $(OBJECTS) $(STATLIB) $(SHLIB) $(AGG_OBJECTS)
35+
rm -f $(SHLIB) $(OBJECTS) $(AGG_OBJECTS) $(STATLIB)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp