diff --git a/.gitmodules b/.gitmodules index be837500980..f5753d5c5d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,7 @@ path = external/mono url = https://github.com/mono/mono.git branch = mono-4.5.0-branch +[submodule "external/mxe"] + path = external/mxe + url = https://github.com/xamarin/mxe.git + branch = xamarin diff --git a/Configuration.Override.props.in b/Configuration.Override.props.in index c8079c312a8..644aa8ebd8d 100644 --- a/Configuration.Override.props.in +++ b/Configuration.Override.props.in @@ -25,5 +25,6 @@ $(HOME)\android-archives $(HOME)\android-toolchain + $(AndroidToolchainDirectory)\mxe diff --git a/Configuration.props b/Configuration.props index a072963b9ff..aee87a7de37 100644 --- a/Configuration.props +++ b/Configuration.props @@ -9,19 +9,23 @@ Darwin Linux clang - clang++ + clang++ mono $(HOMEDRIVE)$(HOMEPATH) 23 v6.0 $(HOME)\android-archives $(HOME)\android-toolchain + $(AndroidToolchainDirectory)\mxe $(AndroidToolchainDirectory)\sdk $(AndroidToolchainDirectory)\ndk - armeabi-v7a + host-$(HostOS),armeabi-v7a $(MSBuildThisFileDirectory)external\mono $(MSBuildThisFileDirectory) + + $([System.IO.Path]::GetFullPath ('$(AndroidMxeInstallPrefix)')) +