More pedantic fixes

andrjohns · Dec 19, 2023 · 25d1260 · 25d1260
1 parent 3721525
commit 25d1260
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -22,9 +22,9 @@ jobs:
           - {os: macos-latest,   r: 'release'}
           - {os: macos-latest,   r: 'oldrel'}
 
-          - {os: windows-latest, r: 'devel', rtools: '43'}
-          - {os: windows-latest, r: 'release', rtools: '42'}
-          - {os: windows-latest, r: 'oldrel', rtools: '40'}
+          - {os: windows-latest, r: 'devel'}
+          - {os: windows-latest, r: 'release'}
+          - {os: windows-latest, r: 'oldrel'}
 
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}

diff --git a/src/Makevars b/src/Makevars
@@ -30,5 +30,8 @@ build-static: $(QUICKJS_OBJECTS)
 	@mkdir -p ../inst/lib/$(R_ARCH)
 	$(AR) -rs ../inst/lib/$(R_ARCH)/libquickjs.a $(QUICKJS_OBJECTS)
 
+$(QUICKJS_OBJECTS): quickjs/%.o : quickjs/%.c
+	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -std=c11 -c $< -o $@
+
 clean:
 	$(RM) $(QUICKJS_OBJECTS) ../inst/lib/$(R_ARCH)/libquickjs.a
diff --git a/src/quickjs b/src/quickjs