Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
Fix configure script for arm

[GENINC]
Add support for IMAGE_FILE_MACHINE_ARMNT

svn path=/trunk/; revision=56937
This commit is contained in:
Timo Kreuzer 2012-07-22 16:29:47 +00:00
parent 611b08e507
commit 505f66f454
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/configure.cmd
View file

@ -9,7 +9,7 @@ if /I "%1" == "arm_hosttools" (
:: Configure host tools for x86
cmake -G %3 -DARCH=i386 %~dp0
exit /b
exit
)
:: Get the source root directory
@ -158,7 +158,7 @@ set REACTOS_BUILD_TOOLS_DIR=%CD%
:: Use x86 for ARM host tools
if "%ARCH%" == "arm" (
:: Launch new script instance for x86 host tools configuration
start "Preparing host tools for ARM cross build..." /WAIT /I /B %~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%
) else (
cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
)

8
reactos/tools/geninc/geninc.c
View file

@ -4,6 +4,10 @@
#include <stdlib.h>
#include <string.h>
#define IMAGE_FILE_MACHINE_I386 0x014c
#define IMAGE_FILE_MACHINE_AMD64 0x8664
#define IMAGE_FILE_MACHINE_ARMNT 0x01c4
#ifdef _WIN32
#define PRIx64 "I64x"
typedef unsigned __int16 uint16_t;
@ -112,7 +116,9 @@ int main(int argc, char* argv[])
goto quit;
}
if (Machine != 0x14c && Machine != 0x8664)
if ((Machine != IMAGE_FILE_MACHINE_I386) &&
(Machine != IMAGE_FILE_MACHINE_AMD64) &&
(Machine != IMAGE_FILE_MACHINE_ARMNT))
{
fprintf(stderr, "Invalid Machine: 0x%x.\n", Machine);
goto quit;