Merge pull request #18 from PageTwo/develop

Support FreeBSD amd64 build
This commit is contained in:
Taro L. Saito 2012-11-15 19:58:39 -08:00
commit 17a9d209d2
2 changed files with 11 additions and 1 deletions

View File

@ -94,6 +94,9 @@ mac32:
linux32:
$(MAKE) native OS_NAME=Linux OS_ARCH=i386
freebsd64:
$(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64
# for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package
linux-arm:
$(MAKE) native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm

View File

@ -41,7 +41,7 @@ endif
# os=Default is meant to be generic unix/linux
known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 Windows-x86 Windows-amd64
known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 Windows-x86 Windows-amd64
os_arch := $(OS_NAME)-$(OS_ARCH)
ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs)))
@ -105,6 +105,13 @@ Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc
Mac-x86_64_LIBNAME := libsnappyjava.jnilib
Mac-x86_64_SNAPPY_FLAGS :=
FreeBSD-amd64_CXX := $(CROSS_PREFIX)g++
FreeBSD-amd64_STRIP := $(CROSS_PREFIX)strip
FreeBSD-amd64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
FreeBSD-amd64_LINKFLAGS := -shared -static-libgcc
FreeBSD-amd64_LIBNAME := libsnappyjava.so
FreeBSD-amd64_SNAPPY_FLAGS :=
Windows-x86_CXX := $(CROSS_PREFIX)g++
Windows-x86_STRIP := $(CROSS_PREFIX)strip
Windows-x86_CXXFLAGS := -Ilib/inc_win -O2