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

Revert "win32 i386 build should use mingw64 if available"

Browse Source 
This reverts commit 74e282a3d3.
This commit is contained in:
Matt Klich 2010-06-09 16:03:48 -06:00
parent f3a1c3253e
commit 686f1ba983
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefile
View File

@ -193,21 +193,12 @@ ifeq ($(platform),windows)
cflags = -I$(inc) $(common-cflags) cflags = -I$(inc) $(common-cflags)
ifeq (,$(filter mingw32 cygwin,$(build-platform))) ifeq (,$(filter mingw32 cygwin,$(build-platform)))
ifeq (,$(shell which x86_64-w64-mingw32-g++))
cxx = i586-mingw32msvc-g++ cxx = i586-mingw32msvc-g++
cc = i586-mingw32msvc-gcc cc = i586-mingw32msvc-gcc
dlltool = i586-mingw32msvc-dlltool dlltool = i586-mingw32msvc-dlltool
ar = i586-mingw32msvc-ar ar = i586-mingw32msvc-ar
ranlib = i586-mingw32msvc-ranlib ranlib = i586-mingw32msvc-ranlib
strip = i586-mingw32msvc-strip strip = i586-mingw32msvc-strip
else
cxx = x86_64-w64-mingw32-g++ $(mflag)
cc = x86_64-w64-mingw32-gcc $(mflag)
dlltool = x86_64-w64-mingw32-dlltool -mi386 --as-flags=--32
ar = x86_64-w64-mingw32-ar
ranlib = x86_64-w64-mingw32-ranlib
strip = x86_64-w64-mingw32-strip
endif
else else
common-cflags += "-I$(JAVA_HOME)/include/win32" common-cflags += "-I$(JAVA_HOME)/include/win32"
build-cflags = $(common-cflags) -I$(src) -mthreads build-cflags = $(common-cflags) -I$(src) -mthreads