tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for mac-x86_64

This commit is contained in:
Taro L. Saito 2011-03-30 16:45:04 +09:00
parent e095a9ec92
commit 83130dc9e8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -40,6 +40,7 @@ clean-native:
NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
snappy: $(TARGET)/snappy-$(VERSION) $(NATIVE_DLL) snappy: $(TARGET)/snappy-$(VERSION) $(NATIVE_DLL)
@ -47,6 +48,7 @@ snappy: $(TARGET)/snappy-$(VERSION) $(NATIVE_DLL)
$(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
@mkdir -p $(@D) @mkdir -p $(@D)
cp $< $@ cp $< $@
cp $< $(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)/$(LIBNAME) @mkdir -p $(NATIVE_TARGET_DIR)
cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)

6
Makefile.common
View File

@ -79,14 +79,14 @@ 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 Mac-x86_64_LINKFLAGS := -dynamiclib
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 Windows-x86_LINKFLAGS := -Wl,--kill-at -static
Windows-x86_LIBNAME := snappy.dll Windows-x86_LIBNAME := snappy.dll
Windows-x86_SNAPPY_FLAGS := Windows-x86_SNAPPY_FLAGS :=
@ -95,7 +95,7 @@ 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 -O2 Windows-amd64_CXXFLAGS := -Ilib/inc_win -O2
Windows-amd64_LINKFLAGS := -Wl,--kill-at -shared -static Windows-amd64_LINKFLAGS := -Wl,--kill-at -static
Windows-amd64_LIBNAME := snappy.dll Windows-amd64_LIBNAME := snappy.dll
Windows-amd64_SNAPPY_FLAGS := Windows-amd64_SNAPPY_FLAGS :=