From e3a47f88a8373a97c8ead55d28e14d2f5c78ddd8 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 22 Jan 2011 16:05:07 +0000 Subject: [PATCH] [CMAKE] Fix configure script for MSVC svn path=/branches/cmake-bringup/; revision=50462 --- configure.cmd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.cmd b/configure.cmd index 327c26227ca..78cc5eca452 100644 --- a/configure.cmd +++ b/configure.cmd @@ -10,6 +10,10 @@ if not "%ROS_ARCH%" == "" ( ) if not "%DDK_TARGET_OS%" == "" ( echo Detected DDK/WDK for %_BUILDARCH% + set ROS_ARCH=%_BUILDARCH% + if "%_BUILDARCH%" == "x86" ( + set ROS_ARCH=i386 + ) set BUILD_ENVIRONMENT=WDK ) @@ -39,7 +43,7 @@ if "%BUILD_ENVIRONMENT%" == "MINGW" ( cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ROS_ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%_BUILDARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ROS_ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) cd..