mirror of
https://github.com/corda/corda.git
synced 2025-01-07 13:38:47 +00:00
Merge branch 'master' of github.com:ReadyTalk/avian
This commit is contained in:
commit
ef2bafcd6b
12
makefile
12
makefile
@ -407,12 +407,12 @@ ifeq ($(platform),windows)
|
|||||||
|
|
||||||
ifeq (,$(filter mingw32 cygwin,$(build-platform)))
|
ifeq (,$(filter mingw32 cygwin,$(build-platform)))
|
||||||
openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
|
openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
|
||||||
cxx = x86_64-w64-mingw32-g++ -m32
|
cxx = i686-w64-mingw32-g++ -m32
|
||||||
cc = x86_64-w64-mingw32-gcc -m32
|
cc = i686-w64-mingw32-gcc -m32
|
||||||
dlltool = x86_64-w64-mingw32-dlltool -mi386 --as-flags=--32
|
dlltool = i686-w64-mingw32-dlltool -mi386 --as-flags=--32
|
||||||
ar = x86_64-w64-mingw32-ar
|
ar = i686-w64-mingw32-ar
|
||||||
ranlib = x86_64-w64-mingw32-ranlib
|
ranlib = i686-w64-mingw32-ranlib
|
||||||
strip = x86_64-w64-mingw32-strip --strip-all
|
strip = i686-w64-mingw32-strip --strip-all
|
||||||
else
|
else
|
||||||
build-system = windows
|
build-system = windows
|
||||||
common-cflags += "-I$(JAVA_HOME)/include/win32"
|
common-cflags += "-I$(JAVA_HOME)/include/win32"
|
||||||
|
Loading…
Reference in New Issue
Block a user