From ffd48bdbb2abb3c526eb03acdfc02168e4d81550 Mon Sep 17 00:00:00 2001 From: Jim Huang Date: Sat, 17 Mar 2018 02:30:04 +0800 Subject: [PATCH] Fix JNI build Close #12 --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cc024e6..49d678f 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,9 @@ CFLAGS += \ LDFLAGS += -L$(OPENCL_LIB) -lOpenCL endif +# FIXME: avoid hardcoded OS path ifneq ("$(DISABLE_JNI)","1") -CFLAGS += \ +CFLAGS_JNI = \ -I$(OPENJDK_PATH)/include \ -I$(OPENJDK_PATH)/include/linux endif @@ -75,6 +76,9 @@ $(OUT)/test_%.o: test/test_%.c $(Q)$(CC) -o $@ $(CFLAGS) -c -MMD -MF $@.d $< $(OUT)/jni/%.o: jni/%.c + $(VECHO) " CC\t$@\n" + $(Q)$(CC) -o $@ $(CFLAGS) $(CFLAGS_JNI) -c -MMD -MF $@.d $< + $(OUT)/trinary/%.o: $(SRC)/trinary/%.c $(OUT)/hash/%.o: $(SRC)/hash/%.c $(OUT)/%.o: $(SRC)/%.c