Skip to content

Commit 54d9be3

Browse files
committed
Fix old Windows
1 parent b6e7ace commit 54d9be3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
- {os: windows-latest, r: '4.2'}
2525
- {os: windows-latest, r: '4.3'}
2626
- {os: windows-latest, r: '4.4'}
27+
- {os: windows-latest, r: 'devel'}
2728
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
2829
- {os: ubuntu-latest, r: 'release'}
2930
- {os: ubuntu-latest, r: 'oldrel-1'}

src/Makevars.win

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ PKG_LIBS = \
1717
-lopencv_video481 -lopencv_calib3d481 -lopencv_xfeatures2d481 -lopencv_features2d481 -lopencv_highgui481 -lopencv_flann481 \
1818
-lopencv_videoio481 -lopencv_imgcodecs481 -lopencv_imgproc481 -lopencv_core481 -llibopenjp2 -lquirc \
1919
-ljpeg -lwebp -lsharpyuv -lpng -lz -ltiff -lpthread -lgdi32 -lole32 -lopengl32 -lcomdlg32 -lOleAut32 -luuid
20-
OPENCVDATA = $(RWINLIB)/share/opencv4
20+
OPENCVDATA = $(RWINLIB)/share
2121
endif
2222

2323
all: $(SHLIB) copydata
@@ -28,8 +28,8 @@ $(RWINLIB):
2828
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
2929

3030
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
3333

3434
clean:
3535
rm -f $(SHLIB) $(OBJECTS)

0 commit comments

Comments
 (0)