Skip to content

Commit 8970a0e

Browse files
committed
Cleaning up jni wrapper code by splitting up the files
1 parent c068c9f commit 8970a0e

6 files changed

Lines changed: 780 additions & 942 deletions

File tree

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ AF_JAVA_JAR = $(AF_JAVA_PATH)/ArrayFire.jar
1616
AF_JAVA_MANIFEST= $(AF_JAVA_PATH)/Manifest.txt
1717
AF_JAVA_COM = $(shell ls com/arrayfire/*.java)
1818
AF_JAVA_CLASSES = $(patsubst %.java, %.class, $(AF_JAVA_COM))
19+
AF_JNI_SRC = $(shell ls $(AF_JAVA_PATH)/src/*.cpp)
1920

2021
ifeq ($(findstring opencl, $(MAKECMDGOALS)), opencl)
2122
AF=afopencl
@@ -44,8 +45,8 @@ $(AF_JAVA_LIB): $(AF_JAVA_LIB_EXT)
4445
cp $(AF_JAVA_LIB_EXT) $(AF_JAVA_LIB)
4546
cp $(AF_LIB_PATH)/lib$(AF).so $(AF_JAVA_PATH)/$(LIB)
4647

47-
$(AF_JAVA_LIB_EXT): $(AF_JAVA_PATH)/src/java_wrapper.cpp
48-
gcc -shared -fPIC $< $(AF_CFLAGS) -L$(AF_LIB_PATH) -l$(AF) -o $@
48+
$(AF_JAVA_LIB_EXT): $(AF_JNI_SRC)
49+
gcc -shared -fPIC $(AF_JNI_SRC) $(AF_CFLAGS) -L$(AF_LIB_PATH) -l$(AF) -o $@
4950

5051
clean:
5152
rm -f lib/*.so $(AF_JAVA_JAR)

0 commit comments

Comments
 (0)