ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Path fix

Browse Source
This commit is contained in:
Alexey Pelykh 2013-01-24 06:39:14 -08:00
parent b1990ba55f
commit 1f77d15040
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makefile
View File

@ -365,26 +365,27 @@ ifeq ($(platform),android)
endif endif
build-cflags = $(common-cflags) -I$(src) build-cflags = $(common-cflags) -I$(src)
build-lflags = -lz -lpthread
ifeq ($(subst cygwin,windows,$(subst mingw32,windows,$(build-platform))),windows) ifeq ($(subst cygwin,windows,$(subst mingw32,windows,$(build-platform))),windows)
toolchain-host-platform = $(subst cygwin,windows,$(subst mingw32,windows,$(build-platform))) toolchain-host-platform = $(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))
build-system = windows build-system = windows
build-cxx = i686-w64-mingw32-g++ build-cxx = i686-w64-mingw32-g++
build-cc = i686-w64-mingw32-gcc build-cc = i686-w64-mingw32-gcc
build-lflags = -lz -lpthread
sysroot = "$$(cygpath -w "$(ndk)/platforms/android-5/arch-arm")" sysroot = "$$(cygpath -w "$(ndk)/platforms/android-5/arch-arm")"
build-cflags += "-I$(JAVA_HOME)/include/win32" build-cflags += "-I$(JAVA_HOME)/include/win32"
else else
toolchain-host-platform = $(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))-$(build-arch) toolchain-host-platform = $(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))-*
sysroot = $(ndk)/platforms/android-5/arch-arm sysroot = $(ndk)/platforms/android-5/arch-arm
build-cflags += "-I$(JAVA_HOME)/include/linux" build-cflags += "-I$(JAVA_HOME)/include/linux"
endif endif
toolchain = $(ndk)/toolchains/arm-linux-androideabi-4.7/prebuilt/$(toolchain-host-platform) toolchain = $(ndk)/toolchains/arm-linux-androideabi-4.7/prebuilt/$(toolchain-host-platform)
cflags = "-I$(sysroot)/usr/include" "-I$(JAVA_HOME)/include/linux" $(common-cflags) "-I$(src)" -std=c++11 -marm $(no-psabi) cflags = "-I$(sysroot)/usr/include" "-I$(JAVA_HOME)/include/linux" $(common-cflags) "-I$(src)" -std=c++11 -marm $(no-psabi)
lflags = $(common-lflags) -ldl lflags = "-L$(sysroot)/usr/lib" $(common-lflags) -ldl
use-lto = false use-lto = false
cxx = $(toolchain)/bin/arm-linux-androideabi-g++ --sysroot="$(sysroot)" cxx = $(toolchain)/bin/arm-linux-androideabi-g++ --sysroot="$(sysroot)"
cc = $(toolchain)/bin/arm-linux-androideabi-gcc --sysroot="$(sysroot)" cc = $(toolchain)/bin/arm-linux-androideabi-gcc --sysroot="$(sysroot)"
as = $(toolchain)/bin/arm-linux-androideabi-as --sysroot="$(sysroot)"
ar = $(toolchain)/bin/arm-linux-androideabi-ar ar = $(toolchain)/bin/arm-linux-androideabi-ar
ranlib = $(toolchain)/bin/arm-linux-androideabi-ranlib ranlib = $(toolchain)/bin/arm-linux-androideabi-ranlib
strip = $(toolchain)/bin/arm-linux-androideabi-strip strip = $(toolchain)/bin/arm-linux-androideabi-strip