use -shared flag

This commit is contained in:
Taro L. Saito 2011-03-30 11:20:18 +09:00
parent 7be32f4746
commit 4e59477bf6
3 changed files with 10 additions and 8 deletions

View File

@ -51,42 +51,42 @@ endif
Default_CXX := g++ Default_CXX := g++
Default_STRIP := strip Default_STRIP := strip
Default_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC Default_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC
Default_LINKFLAGS := -shared -static-libgcc Default_LINKFLAGS := -shared -static
Default_LIBNAME := libsnappy.so Default_LIBNAME := libsnappy.so
Default_SNAPPY_FLAGS := Default_SNAPPY_FLAGS :=
Linux-i386_CXX := g++ Linux-i386_CXX := g++
Linux-i386_STRIP := strip Linux-i386_STRIP := strip
Linux-i386_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC Linux-i386_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC
Linux-i386_LINKFLAGS := -shared -static-libgcc Linux-i386_LINKFLAGS := -shared -static
Linux-i386_LIBNAME := libsnappy.so Linux-i386_LIBNAME := libsnappy.so
Linux-i386_SNAPPY_FLAGS:= Linux-i386_SNAPPY_FLAGS:=
Linux-amd64_CXX := g++ Linux-amd64_CXX := g++
Linux-amd64_STRIP := strip Linux-amd64_STRIP := strip
Linux-amd64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC Linux-amd64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC
Linux-amd64_LINKFLAGS := -shared -static-libgcc Linux-amd64_LINKFLAGS := -shared -static
Linux-amd64_LIBNAME := libsnappy.so Linux-amd64_LIBNAME := libsnappy.so
Linux-amd64_SNAPPY_FLAGS := Linux-amd64_SNAPPY_FLAGS :=
Mac-i386_CXX := g++ -arch $(OS_ARCH) Mac-i386_CXX := g++ -arch $(OS_ARCH)
Mac-i386_STRIP := strip -x Mac-i386_STRIP := strip -x
Mac-i386_CXXFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC Mac-i386_CXXFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC
Mac-i386_LINKFLAGS := -dynamiclib -static-libgcc Mac-i386_LINKFLAGS := -dynamiclib -static
Mac-i386_LIBNAME := libsnappy.jnilib Mac-i386_LIBNAME := libsnappy.jnilib
Mac-i386_SNAPPY_FLAGS := Mac-i386_SNAPPY_FLAGS :=
Mac-x86_64_CXX := g++ -arch $(OS_ARCH) Mac-x86_64_CXX := g++ -arch $(OS_ARCH)
Mac-x86_64_STRIP := strip -x Mac-x86_64_STRIP := strip -x
Mac-x86_64_CXXFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC Mac-x86_64_CXXFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC
Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc Mac-x86_64_LINKFLAGS := -dynamiclib -static
Mac-x86_64_LIBNAME := libsnappy.jnilib Mac-x86_64_LIBNAME := libsnappy.jnilib
Mac-x86_64_SNAPPY_FLAGS := Mac-x86_64_SNAPPY_FLAGS :=
Windows-x86_CXX := mingw32-g++ Windows-x86_CXX := mingw32-g++
Windows-x86_STRIP := strip Windows-x86_STRIP := strip
Windows-x86_CXXFLAGS := -Ilib/inc_win -O2 Windows-x86_CXXFLAGS := -Ilib/inc_win -O2
Windows-x86_LINKFLAGS := -Wl,--kill-at -shared -static-libgcc Windows-x86_LINKFLAGS := -Wl,--kill-at -shared -static
Windows-x86_LIBNAME := snappy.dll Windows-x86_LIBNAME := snappy.dll
Windows-x86_SNAPPY_FLAGS := Windows-x86_SNAPPY_FLAGS :=
@ -94,7 +94,7 @@ Windows-amd64_CXX := x86_64-w64-mingw32-g++
Windows-amd64_STRIP := x86_64-w64-mingw32-strip Windows-amd64_STRIP := x86_64-w64-mingw32-strip
#Windows-amd64_CXX := i686-w64-mingw32-g++ #Windows-amd64_CXX := i686-w64-mingw32-g++
#Windows-amd64_STRIP := i686-w64-mingw32-strip #Windows-amd64_STRIP := i686-w64-mingw32-strip
Windows-amd64_CXXFLAGS := -Ilib/inc_win -Os Windows-amd64_CXXFLAGS := -Ilib/inc_win -O2
Windows-amd64_LINKFLAGS := -Wl,--kill-at -shared -static Windows-amd64_LINKFLAGS := -Wl,--kill-at -shared -static
Windows-amd64_LIBNAME := snappy.dll Windows-amd64_LIBNAME := snappy.dll
Windows-amd64_SNAPPY_FLAGS := Windows-amd64_SNAPPY_FLAGS :=

View File

@ -51,7 +51,7 @@ JNIEXPORT jlong JNICALL Java_org_xerial_snappy_Snappy_maxCompressedLength
* Signature: (Ljava/nio/ByteBuffer;)J * Signature: (Ljava/nio/ByteBuffer;)J
*/ */
JNIEXPORT jlong JNICALL Java_org_xerial_snappy_Snappy_getUncompressedLength JNIEXPORT jlong JNICALL Java_org_xerial_snappy_Snappy_getUncompressedLength
(JNIEnv *, jobject, jobject) (JNIEnv *, jclass, jobject)
{ {
return (jlong) 0; return (jlong) 0;

View File

@ -32,5 +32,7 @@ public class SnappyTest
ByteBuffer dest = ByteBuffer.allocate(1024); ByteBuffer dest = ByteBuffer.allocate(1024);
Snappy.compress(src, dest); Snappy.compress(src, dest);
long uncompressedLen = Snappy.getUncompressedLength(dest);
_logger.info("uncompressed length:" + uncompressedLen);
} }
} }