build mac native lib

eiryu · Mar 4, 2016 · 96b8021 · 96b8021
1 parent 49898bb
commit 96b8021
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ all: larray
 include Makefile.common
 
 
-SRC:=larray-mmap/src/main/scala
+SRC:=larray-mmap/src/main/java
 
 LARRAY_OUT:=$(TARGET)/larray-$(os_arch)
 LARRAY_SRC_DIR:=$(SRC)/xerial/larray/impl
@@ -28,9 +28,6 @@ $(LARRAY_HEADER): $(SRC)/xerial/larray/impl/LArrayNative.java  $(TARGET)/classes
 	$(JAVAH) -classpath $(TARGET)/classes -o $@ xerial.larray.impl.LArrayNative
 
 
-
-
-
 $(LARRAY_OUT)/%.o : $(LARRAY_SRC_DIR)/%.c 
 	@mkdir -p $(@D)
 	$(CC) $(CFLAGS) -c $< -o $@ 

diff --git a/Makefile.common b/Makefile.common
@@ -1,5 +1,5 @@
 TARGET:=larray-mmap/target
-SRC:=larray-mmap/src/main/scala
+SRC:=larray-mmap/src/main/java
 
 ifndef JAVA_HOME
 $(error Set JAVA_HOME environment variable)
@@ -95,7 +95,7 @@ Mac-i386_LIBNAME   := liblarray.jnilib
 Mac-x86_64_CC       := gcc -arch $(OS_ARCH)
 Mac-x86_64_STRIP     := strip -x
 Mac-x86_64_CFLAGS  := -Iinclude/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden
-Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc 
+Mac-x86_64_LINKFLAGS := -dynamiclib 
 Mac-x86_64_LIBNAME   := liblarray.jnilib
 
 Windows-x86_CC          := $(CROSS_PREFIX)gcc

diff --git a/larray-mmap/src/main/resources/xerial/larray/native/Mac/x86_64/liblarray.jnilib b/larray-mmap/src/main/resources/xerial/larray/native/Mac/x86_64/liblarray.jnilib