|
Line
Link Here
|
| 0 |
-- jni/GNUmakefile |
0 |
++ jni/GNUmakefile |
|
Lines 41-46
Link Here
|
| 41 |
JFFI_BUILD_DIR = $(BUILD_DIR)/jffi |
41 |
JFFI_BUILD_DIR = $(BUILD_DIR)/jffi |
| 42 |
|
42 |
|
| 43 |
ifeq ($(USE_SYSTEM_LIBFFI),1) |
43 |
ifeq ($(USE_SYSTEM_LIBFFI),1) |
|
|
44 |
LIBFFI = |
| 44 |
LIBFFI_LIBS ?= $(shell pkg-config --libs libffi) |
45 |
LIBFFI_LIBS ?= $(shell pkg-config --libs libffi) |
| 45 |
LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi) |
46 |
LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi) |
| 46 |
else |
47 |
else |
|
Lines 64-72
Link Here
|
| 64 |
OFLAGS = -O2 $(JFLAGS) |
65 |
OFLAGS = -O2 $(JFLAGS) |
| 65 |
|
66 |
|
| 66 |
# MacOS headers aren't completely warning free, so turn them off |
67 |
# MacOS headers aren't completely warning free, so turn them off |
| 67 |
WERROR = -Werror |
|
|
| 68 |
ifneq ($(OS),darwin) |
68 |
ifneq ($(OS),darwin) |
| 69 |
WFLAGS += -Wundef $(WERROR) |
69 |
WFLAGS += -Wundef |
| 70 |
endif |
70 |
endif |
| 71 |
WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter |
71 |
WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter |
| 72 |
PICFLAGS = -fPIC |
72 |
PICFLAGS = -fPIC |
|
Lines 279-285
Link Here
|
| 279 |
@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)" |
279 |
@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)" |
| 280 |
@echo "OBJS=$(OBJS)" |
280 |
@echo "OBJS=$(OBJS)" |
| 281 |
|
281 |
|
| 282 |
$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) |
282 |
$(LIBJFFI): $(OBJS) $(LIBFFI) |
| 283 |
$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) |
283 |
$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) |
| 284 |
$(STRIP) $@ |
284 |
$(STRIP) $@ |
| 285 |
|
285 |
|
|
Lines 291-297
Link Here
|
| 291 |
@mkdir -p $(@D) |
291 |
@mkdir -p $(@D) |
| 292 |
@$(CC) $(CFLAGS) -o $@ -c $< |
292 |
@$(CC) $(CFLAGS) -o $@ -c $< |
| 293 |
|
293 |
|
| 294 |
$(OBJS) : $(LIBFFI_LIBS) |
294 |
$(OBJS) : $(LIBFFI) |
| 295 |
|
295 |
|
| 296 |
ifeq ($(OS), darwin) |
296 |
ifeq ($(OS), darwin) |
| 297 |
build_ffi = \ |
297 |
build_ffi = \ |
| 298 |
-- libtest/GNUmakefile |
298 |
++ libtest/GNUmakefile |
|
Lines 44-51
Link Here
|
| 44 |
# Compiler/linker flags from: |
44 |
# Compiler/linker flags from: |
| 45 |
# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html |
45 |
# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html |
| 46 |
JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing |
46 |
JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing |
| 47 |
OFLAGS = -O2 $(JFLAGS) |
47 |
OFLAGS = $(JFLAGS) |
| 48 |
WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses |
48 |
WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses |
| 49 |
PICFLAGS = -fPIC |
49 |
PICFLAGS = -fPIC |
| 50 |
SOFLAGS = -shared -Wl,-O1 |
50 |
SOFLAGS = -shared -Wl,-O1 |
| 51 |
LDFLAGS += $(SOFLAGS) |
51 |
LDFLAGS += $(SOFLAGS) |
