fix MSVC vs mingw build switch

Author: Facebook Post Examples For A Stry

build.xml

@@ -689,6 +689,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
  <!-- ensure ARCH is set properly for 64-bit capable platforms -->
  <!-- use ANT_OPTS=-d64/-d32 to build 64-bit/32-bit if not the platform default -->
  <property name="ARCH" value="${os.arch}"/>
+ <condition property="make.USE_MSVC" value="USE_MSVC=${USE_MSVC}" else="IGNORE=">
+ <isset property="USE_MSVC"/>
+ </condition>
  <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
  <isset property="CC"/>
  </condition>
@@ -774,6 +777,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
  <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
  <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
  <arg value="${make.CC}"/>
+ <arg value="${make.USE_MSVC}"/>
  <arg value="${make.BUILD}"/>
  <arg value="${make.SDKROOT}"/>
  <arg value="${make.ARCH}"/>
@@ -916,8 +920,8 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
  <target name="test" depends="-enable-native,jar,compile-tests" unless="cross-compile"
  description="Run all unit tests">
  <property name="test.fork" value="yes"/>
- <property name="reports.junit" location="${reports}/junit"/>
- <property name="results.junit" location="${build}/junit-results"/>
+ <property name="reports.junit" location="${reports}/junit/${os.prefix}"/>
+ <property name="results.junit" location="${build}/junit-results/${os.prefix}"/>
  <mkdir dir="${results.junit}"/>
  <echo>Saving test results in ${results.junit}</echo>
  <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>

native/Makefile

@@ -177,7 +177,7 @@ LIBPFX=
 LIBSFX=.dll
 TESTLIB_TRUNC=$(BUILD)/testlib-truncated.dll
 
-ifdef USE_MSVC
+ifeq ($(USE_MSVC),true)
 CC=$(FFI_SRC)/msvcc.sh
 COPT=
 CPP=cl -nologo -EP
@@ -195,20 +195,22 @@ EXTRAOBJS+=$(DLLCB)
 else
 MINGW_PREFIX?=i686-pc-mingw32-
 CC=$(MINGW_PREFIX)gcc
+CPP=$(MINGW_PREFIX)gcc -E
 LDFLAGS=-o $@ -shared -Wl,--add-stdcall-alias
 LIBS=-lpsapi
+FFI_ENV+=CXXCPP="$(CPP)"
 endif
 
 ifeq ($(ARCH),amd64)
-# Undefine USE_MSVC to enable mingw64 cross compiler; ensure $(MINGW) is in
+# Set USE_MSVC false to enable mingw64 cross compiler; ensure $(MINGW) is in
 # PATH. Should build properly as of 111121, but lacks SEH, so MSVC build is
 # preferred
 MINGW_PREFIX?=x86_64-w64-mingw32-
 MINGW=$(MINGW_PREFIX)gcc 
 # Need windres from mingw distribution, even if building with MSVC
 WINDRES=$(MINGW_PREFIX)windres
 
-ifndef USE_MSVC
+ifneq ($(USE_MSVC),true)
 CC=$(MINGW)
 # No SEH under mingw64, thus no HAVE_PROTECTION
 CDEFINES=-DPSAPI_VERSION=1

www/WindowsDevelopmentEnvironment.md

@@ -11,7 +11,7 @@ Set `JAVA_HOME` to a 32-bit JDK, eg. `C:\Program Files (x86)\java\jdk1.6.0_24`.
 
 Install [cygwin](http://www.cygwin.com/).
 
-When installing cygwin, include ssh, git, make, autotools, and mingw32-gcc-core.
+When installing cygwin, include ssh, git, make, autotools, and mingw32-g++.
 Ensure the mingw32 compiler (i686-pc-mingw32-gcc.exe) is on your path.
 
 64-bit Windows
@@ -26,7 +26,7 @@ Set `JAVA_HOME` to a 64-bit JDK, eg. `C:\Program Files\java\jdk1.6.0_24`.
 Install [cygwin](http://www.cygwin.com/).
 
 When installing cygwin, include ssh, git, make, autotools, and
-mingw64-gcc-core. Ensure the mingw64 compiler (i686-pc-mingw64-gcc.exe) is on
+mingw64-g++. Ensure the mingw64 compiler (i686-pc-mingw64-gcc.exe) is on
 your path.
 
 MSVC