[ros-diffs] [tkreuzer] 56937: [CMAKE] Fix configure script for arm [GENINC] Add support for IMAGE_FILE_MACHINE_ARMNT

Author: tkreuzer
Date: Sun Jul 22 16:29:47 2012
New Revision: 56937

URL: http://svn.reactos.org/svn/reactos?rev=56937&view=rev
Log:
[CMAKE]
Fix configure script for arm

[GENINC]
Add support for IMAGE_FILE_MACHINE_ARMNT

Modified:
    trunk/reactos/configure.cmd
    trunk/reactos/tools/geninc/geninc.c

Modified: trunk/reactos/configure.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=56937&am…
==============================================================================
--- trunk/reactos/configure.cmd [iso-8859-1] (original)
+++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 22 16:29:47 2012
@@ -9,7 +9,7 @@
 
     :: Configure host tools for x86
     cmake -G %3 -DARCH=i386 %~dp0
-    exit /b
+    exit
 )
 
 :: Get the source root directory
@@ -158,7 +158,7 @@
 :: 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%
 )

Modified: trunk/reactos/tools/geninc/geninc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/geninc.c?rev=…
==============================================================================
--- trunk/reactos/tools/geninc/geninc.c [iso-8859-1] (original)
+++ trunk/reactos/tools/geninc/geninc.c [iso-8859-1] Sun Jul 22 16:29:47 2012
@@ -3,6 +3,10 @@
 #include <stdio.h>
 #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"
@@ -112,7 +116,9 @@
         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;