Skip to content

Commit 0dae87a

Browse files
committed
Remove static
1 parent 215133b commit 0dae87a

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

src/Makevars

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_CPPFLAGS = -I"../inst/include/" -I"../inst/include/quickjs" -D_GNU_SOURCE
2-
PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
2+
PKG_LIBS = libquickjs.o
33

44
ifeq ($(OS),Windows_NT)
55
DLL := .dll
@@ -43,9 +43,9 @@ $(OBJECTS): build-static
4343
build-static:
4444
@mkdir -p ../inst/include/quickjs
4545
@cp $(wildcard quickjs/*.h) ../inst/include/quickjs
46-
$(R_CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DNDEBUG -funsigned-char -std=gnu11 -c libquickjs.c
47-
@mkdir -p ../inst/lib/$(R_ARCH)
48-
$(AR) -rs ../inst/lib/$(R_ARCH)/libquickjs.a libquickjs.o
46+
$(R_CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -funsigned-char -std=gnu11 -c libquickjs.c
47+
# @mkdir -p ../inst/lib/$(R_ARCH)
48+
# $(AR) -rs ../inst/lib/$(R_ARCH)/libquickjs.a libquickjs.o
4949

5050
clean:
5151
$(RM) libquickjs.o $(OBJECTS) QuickJSR$(DLL)

src/libquickjs.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
#include <stdio.h>
2-
3-
void Rf_error(const char *, ...);
4-
void Rprintf(const char *, ...);
5-
void Rf_abort(void) {
6-
Rf_error("Aborted");
7-
}
8-
void Rf_exit(int status) {
9-
Rf_error("Exit with status %d", status);
10-
}
11-
void Rf_putchar(int c) {
12-
Rprintf("%c", c);
13-
}
14-
15-
#define abort Rf_abort
16-
#define putchar Rf_putchar
17-
#define _putchar Rf_putchar
18-
#define exit Rf_exit
19-
#define _exit Rf_exit
20-
#define printf Rprintf
21-
221
#include "quickjs/cutils.c"
232
#include "quickjs/libbf.c"
243
#include "quickjs/libregexp.c"

0 commit comments

Comments
 (0)