diff --git a/Makefile b/Makefile index 0821c87..04f0435 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,8 @@ SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch) SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz -SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc +#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc +SNAPPY_CC:= SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION) SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy @@ -100,7 +101,8 @@ $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class -$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED) +$(SNAPPY_SRC): +# $(SNAPPY_GIT_UNPACKED) # aarch64 can use big-endian optimzied code ifeq ($(OS_ARCH),aarch64) @@ -122,7 +124,7 @@ $(CXX) $(CXXFLAGS) -c $< -o $@ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) - $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) + $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy # Workaround for strip Protocol error when using VirtualBox on Mac cp $@ /tmp/$(@F) $(STRIP) /tmp/$(@F) @@ -140,9 +142,9 @@ #snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") snappy-jar-version:=snappy -native: jni-header snappy-header $(NATIVE_DLL) -native-nocmake: jni-header $(NATIVE_DLL) -snappy: native $(TARGET)/$(snappy-jar-version).jar +native: $(NATIVE_DLL) +native-nocmake: $(NATIVE_DLL) +snappy: native native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le @@ -151,6 +153,7 @@ cp $(SNAPPY_OUT)/$(LIBNAME) $@ @mkdir -p $(NATIVE_TARGET_DIR) cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME) + cp $< $(TARGET)/ package: $(TARGET)/$(snappy-jar-version).jar