Skip to content

Commit

Permalink
Update makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
andrjohns committed Jan 20, 2024
1 parent 52a7e62 commit 867c8d9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
inst/lib$
inst
*.o
*.so
*.a
Expand Down
11 changes: 6 additions & 5 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
PKG_CPPFLAGS = -I"../inst/include/quickjs" -DSTRICT_R_HEADERS -D_GNU_SOURCE -DCONFIG_VERSION=\"2023-12-09\" -DCONFIG_BIGNUM
PKG_CPPFLAGS = -I"../inst/include/quickjs" -DSTRICT_R_HEADERS -D_GNU_SOURCE -DCONFIG_BIGNUM
PKG_CPPFLAGS += -DCONFIG_VERSION=\"$(shell cat quickjs/VERSION)\"
PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a

ifeq ($(shell getconf LONG_BIT), 32)
PKG_LIBS += -latomic
endif

QUICKJS_C_FILES = cutils.c libbf.c libregexp.c libunicode.c quickjs.c quickjs-libc.c
QUICKJS_C_HEADERS = cutils.h libbf.h libregexp.h libregexp-opcode.h libunicode.h \
quickjs.h quickjs-libc.h libunicode-table.h list.h quickjs-atom.h \
quickjs-opcode.h
QUICKJS_C_HEADERS = $(QUICKJS_C_FILES:.c=.h) \
libregexp-opcode.h libunicode-table.h list.h \
quickjs-atom.h quickjs-opcode.h

QUICKJS_SOURCES = $(QUICKJS_C_FILES:%=quickjs/%)
QUICKJS_OBJECTS = $(QUICKJS_SOURCES:.c=.o)
Expand All @@ -31,7 +32,7 @@ build-static: $(QUICKJS_OBJECTS)
$(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 $@
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -funsigned-char -fwrapv -std=c11 -c $< -o $@

clean:
$(RM) $(QUICKJS_OBJECTS) ../inst/lib/$(R_ARCH)/libquickjs.a
2 changes: 1 addition & 1 deletion src/quickjs
Submodule quickjs updated 1 files
+2 −2 Makefile

0 comments on commit 867c8d9

Please sign in to comment.