Author: tkreuzer
Date: Mon Dec 27 23:14:50 2010
New Revision: 50176
URL:
http://svn.reactos.org/svn/reactos?rev=50176&view=rev
Log:
[CMAKE]
Add support for different architectures to configure script and simplify it a bit
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] Mon Dec 27 23:14:50 2010
@@ -4,23 +4,14 @@
set ROS_SOURCE_DIR=%~dp0
rem Detect build environment (Mingw, VS, WDK, ...)
-if "%ROS_ARCH%" == "i386" (
- echo Detected RosBE for i386
- set BUILD_ENVIRONMENT=MINGW
-)
-if "%ROS_ARCH%" == "amd64" (
- echo Detected RosBE for amd64
- set BUILD_ENVIRONMENT=MINGW
-)
-if "%ROS_ARCH%" == "arm" (
- echo Detected RosBE for arm
+if not "%ROS_ARCH%" == "" (
+ echo Detected RosBE for %ROS_ARCH%
set BUILD_ENVIRONMENT=MINGW
)
if not "%DDK_TARGET_OS%" == "" (
- echo Detected DDK/WDK
+ echo Detected DDK/WDK for %_BUILDARCH%
set BUILD_ENVIRONMENT=WDK
)
-
rem Create directories
@@ -45,12 +36,12 @@
cd reactos
if "%BUILD_ENVIRONMENT%" == "MINGW" (
- cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake
%ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%"
+ 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
%ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%"
+ cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake
-DARCH=%_BUILDARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%"
%ROS_SOURCE_DIR%
)
cd..
rem Create a root makefile
-@echo someshit > makefile
+rem echo ... > makefile