Cleanup

Author: andrjohns

src/Makevars

@@ -1,5 +1,5 @@
-PKG_CPPFLAGS = -DNDEBUG -I"../inst/include/" -I"../inst/include/quickjs" -D_GNU_SOURCE
-#PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
+PKG_CPPFLAGS = -I"../inst/include/" -I"../inst/include/quickjs" -D_GNU_SOURCE
+PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
 
 ifeq ($(OS),Windows_NT)
   DLL := .dll
@@ -33,19 +33,19 @@ else
 endif
 
 CPP_SOURCES = quickjsr.cpp init.cpp
-C_SOURCES = mask.c quickjs_copy/cutils.c quickjs_copy/libbf.c quickjs_copy/libregexp.c quickjs_copy/libunicode.c quickjs_copy/quickjs.c quickjs_copy/quickjs-libc.c
-SOURCES = $(CPP_SOURCES) $(C_SOURCES)
-OBJECTS = $(CPP_SOURCES:.cpp=.o) $(C_SOURCES:.c=.o)
+#C_SOURCES = mask.c quickjs_copy/cutils.c quickjs_copy/libbf.c quickjs_copy/libregexp.c quickjs_copy/libunicode.c quickjs_copy/quickjs.c #quickjs_copy/quickjs-libc.c
+SOURCES = $(CPP_SOURCES) #$(C_SOURCES)
+OBJECTS = $(CPP_SOURCES:.cpp=.o) #$(C_SOURCES:.c=.o)
 
 $(SHLIB): $(OBJECTS)
 $(OBJECTS): build-static
 
 build-static:
 	@mkdir -p ../inst/include/quickjs
 	@cp $(wildcard quickjs/*.h) ../inst/include/quickjs
-#	$(R_CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DNDEBUG -funsigned-char -std=gnu11 -c libquickjs.c
-#	@mkdir -p ../inst/lib/$(R_ARCH)
-#	$(AR) -rs ../inst/lib/$(R_ARCH)/libquickjs.a libquickjs.o
+	$(R_CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DNDEBUG -funsigned-char -std=gnu11 -c libquickjs.c
+	@mkdir -p ../inst/lib/$(R_ARCH)
+	$(AR) -rs ../inst/lib/$(R_ARCH)/libquickjs.a libquickjs.o
 
 clean:
 	$(RM) libquickjs.o $(OBJECTS) QuickJSR$(DLL)

src/libquickjs.c

@@ -17,6 +17,7 @@ void Rf_putchar(int c) {
 #define _putchar Rf_putchar
 #define exit Rf_exit
 #define _exit Rf_exit
+#define printf Rprintf
 
 #include "quickjs/cutils.c"
 #include "quickjs/libbf.c"