File tree 2 files changed +4
-3
lines changed
2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 24
24
- {os: windows-latest, r: '4.2'}
25
25
- {os: windows-latest, r: '4.3'}
26
26
- {os: windows-latest, r: '4.4'}
27
+ - {os: windows-latest, r: 'devel'}
27
28
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
28
29
- {os: ubuntu-latest, r: 'release'}
29
30
- {os: ubuntu-latest, r: 'oldrel-1'}
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ PKG_LIBS = \
17
17
-lopencv_video481 -lopencv_calib3d481 -lopencv_xfeatures2d481 -lopencv_features2d481 -lopencv_highgui481 -lopencv_flann481 \
18
18
-lopencv_videoio481 -lopencv_imgcodecs481 -lopencv_imgproc481 -lopencv_core481 -llibopenjp2 -lquirc \
19
19
-ljpeg -lwebp -lsharpyuv -lpng -lz -ltiff -lpthread -lgdi32 -lole32 -lopengl32 -lcomdlg32 -lOleAut32 -luuid
20
- OPENCVDATA = $(RWINLIB)/share/opencv4
20
+ OPENCVDATA = $(RWINLIB)/share
21
21
endif
22
22
23
23
all: $(SHLIB) copydata
@@ -28,8 +28,8 @@ $(RWINLIB):
28
28
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
29
29
30
30
copydata:
31
- rm -Rf ../inst/share && mkdir -p ../inst/share
32
- cp -Rf $(OPENCVDATA) ../inst/share/
31
+ rm -Rf ../inst/share && mkdir -p ../inst
32
+ cp -Rf $(OPENCVDATA) ../inst/share
33
33
34
34
clean:
35
35
rm -f $(SHLIB) $(OBJECTS)
You can’t perform that action at this time.
0 commit comments