Author: tkreuzer
Date: Sat Jan 22 16:05:07 2011
New Revision: 50462
URL:
http://svn.reactos.org/svn/reactos?rev=50462&view=rev
Log:
[CMAKE]
Fix configure script for MSVC
Modified:
branches/cmake-bringup/configure.cmd
Modified: branches/cmake-bringup/configure.cmd
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev…
==============================================================================
--- branches/cmake-bringup/configure.cmd [iso-8859-1] (original)
+++ branches/cmake-bringup/configure.cmd [iso-8859-1] Sat Jan 22 16:05:07 2011
@@ -10,6 +10,10 @@
)
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 @@
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..