Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 15:36:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Use the x86 toolchain for host tools if the targeting platform is ARM. Brought to you by Yuntian Zhang.
CORE-7407 #resolve #comment Committed in r64849. Thanks!

svn path=/trunk/; revision=64849
This commit is contained in:
Amine Khaldi 2014-10-20 17:35:22 +00:00
parent 7d9706dd1f
commit 2047c64c1f
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/configure.cmd
View file

@ -77,6 +77,7 @@ if defined ROS_ARCH (
set CMAKE_GENERATOR="Visual Studio 11 Win64" set CMAKE_GENERATOR="Visual Studio 11 Win64"
) else if "!ARCH!" == "arm" ( ) else if "!ARCH!" == "arm" (
set CMAKE_GENERATOR="Visual Studio 11 ARM" set CMAKE_GENERATOR="Visual Studio 11 ARM"
set CMAKE_GENERATOR_HOST="Visual Studio 11"
) else ( ) else (
set CMAKE_GENERATOR="Visual Studio 11" set CMAKE_GENERATOR="Visual Studio 11"
) )
@ -85,6 +86,7 @@ if defined ROS_ARCH (
set CMAKE_GENERATOR="Visual Studio 12 Win64" set CMAKE_GENERATOR="Visual Studio 12 Win64"
) else if "!ARCH!" == "arm" ( ) else if "!ARCH!" == "arm" (
set CMAKE_GENERATOR="Visual Studio 12 ARM" set CMAKE_GENERATOR="Visual Studio 12 ARM"
set CMAKE_GENERATOR_HOST="Visual Studio 12"
) else ( ) else (
set CMAKE_GENERATOR="Visual Studio 12" set CMAKE_GENERATOR="Visual Studio 12"
) )
@ -116,6 +118,9 @@ if %USE_VSCMD% == 1 (
) else ( ) else (
set CMAKE_GENERATOR="Ninja" set CMAKE_GENERATOR="Ninja"
) )
if "!ARCH!" == "arm" (
set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR!
)
) )
:: Create directories :: Create directories
@ -146,7 +151,7 @@ set REACTOS_BUILD_TOOLS_DIR=%CD%
:: Use x86 for ARM host tools :: Use x86 for ARM host tools
if "%ARCH%" == "arm" ( if "%ARCH%" == "arm" (
:: Launch new script instance for x86 host tools configuration :: Launch new script instance for x86 host tools configuration
start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR% start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR_HOST%
) else ( ) else (
cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%" cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"
) )