Merge pull request #167 from marktwtn/fix-building-with-remote-and-jni

fix: fix build error with BUILD_REMOTE and BUILD_JNI enabled
DLTcollab · Jun 28, 2019 · 748ab9b · 748ab9b
2 parents 695b7eb + d99addb
commit 748ab9b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -152,7 +152,11 @@ OBJS += \
 	remote_common.o \
 	remote_interface.o
 
-WORKER_OBJS := $(addprefix $(OUT)/worker-,$(filter-out remote_interface.o, $(OBJS)))
+WORKER_EXCLUDE_OBJS := remote_interface.o
+ifeq ("$(BUILD_JNI)", "1")
+WORKER_EXCLUDE_OBJS += jni/iri-pearldiver-exlib.o
+endif
+WORKER_OBJS := $(addprefix $(OUT)/worker-,$(filter-out $(WORKER_EXCLUDE_OBJS), $(OBJS)))
 WORKER_CFLAGS := $(filter-out -DENABLE_REMOTE, $(CFLAGS))
 endif