diff --git a/Makefile.common b/Makefile.common index 93e9c87..71be222 100755 --- a/Makefile.common +++ b/Makefile.common @@ -240,14 +240,14 @@ Mac-x86_CXX := g++ -arch i386 Mac-x86_STRIP := strip -x Mac-x86_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -std=c++11 Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc -Mac-x86_LIBNAME := libsnappyjava.jnilib +Mac-x86_LIBNAME := libsnappyjava.dylib Mac-x86_SNAPPY_FLAGS := Mac-x86_64_CXX := c++ -arch $(OS_ARCH) Mac-x86_64_STRIP := strip -x Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -stdlib=libc++ -std=c++11 Mac-x86_64_LINKFLAGS := -dynamiclib -Mac-x86_64_LIBNAME := libsnappyjava.jnilib +Mac-x86_64_LIBNAME := libsnappyjava.dylib Mac-x86_64_SNAPPY_FLAGS := FreeBSD-x86_64_CXX := $(CROSS_PREFIX)g++ diff --git a/Makefile.package b/Makefile.package index 3382c82..6617e0e 100755 --- a/Makefile.package +++ b/Makefile.package @@ -28,8 +28,8 @@ DLL_DIR=src/main/resources/org/xerial/snappy/native DLL_WIN=$(DLL_DIR)/Windows/x86/snappyjava.dll DLL_WIN64=$(DLL_DIR)/Windows/amd64/snappyjava.dll -DLL_MAC=$(DLL_DIR)/Mac/x86_64/libsnappyjava.jnilib -DLL_TIGER_MAC=$(DLL_DIR)/Mac/i386/libsnappyjava.jnilib +DLL_MAC=$(DLL_DIR)/Mac/x86_64/libsnappyjava.dylib +DLL_TIGER_MAC=$(DLL_DIR)/Mac/i386/libsnappyjava.dylib DLL_LINUX=$(DLL_DIR)/Linux/i386/libsnappyjava.so DLL_AMD64=$(DLL_DIR)/Linux/amd64/libsnappyjava.so diff --git a/build.sbt b/build.sbt index d3ed0fd..b10abde 100644 --- a/build.sbt +++ b/build.sbt @@ -83,8 +83,8 @@ OsgiKeys.additionalHeaders := Map( "org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x64", "org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=amd64", "org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=win32;processor=x86", - "org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;osname=macosx;processor=x86", - "org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;osname=macosx;processor=x86-64", + "org/xerial/snappy/native/Mac/x86/libsnappyjava.dylib;osname=macosx;processor=x86", + "org/xerial/snappy/native/Mac/x86_64/libsnappyjava.dylib;osname=macosx;processor=x86-64", "org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x86-64", "org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x64", "org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=amd64", diff --git a/src/main/java/org/xerial/snappy/SnappyLoader.java b/src/main/java/org/xerial/snappy/SnappyLoader.java index f1d0665..667dd9f 100644 --- a/src/main/java/org/xerial/snappy/SnappyLoader.java +++ b/src/main/java/org/xerial/snappy/SnappyLoader.java @@ -348,7 +348,7 @@ public class SnappyLoader if (!hasNativeLib) { if (OSInfo.getOSName().equals("Mac")) { // Fix for openjdk7 for Mac - String altName = "libsnappyjava.jnilib"; + String altName = "libsnappyjava.dylib"; if (hasResource(snappyNativeLibraryPath + "/" + altName)) { snappyNativeLibraryName = altName; hasNativeLib = true; diff --git a/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.dylib b/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.dylib new file mode 100755 index 0000000..9075021 Binary files /dev/null and b/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.dylib differ diff --git a/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib b/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib deleted file mode 100755 index 745a7d6..0000000 Binary files a/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib and /dev/null differ