[REG_WINETEST] Import from Wine Staging 1.7.37. CORE-9246

[reactos.git] / reactos / configure.sh

diff --git a/reactos/configure.sh b/reactos/configure.sh
index 14a1015..be49ba4 100755 (executable)
--- a/reactos/configure.sh
+++ b/reactos/configure.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ "x$ROS_ARCH" = "x" ]; then
-  echo Could not detect RosBE.
-  exit 1
+       echo Could not detect RosBE.
+       exit 1
 fi
 
 BUILD_ENVIRONMENT=MinGW
@@ -11,8 +11,8 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
 REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
 
 usage() {
-echo Invalid parameter given.
-exit 1
+       echo Invalid parameter given.
+       exit 1
 }
 
 CMAKE_GENERATOR="Ninja"
@@ -21,14 +21,14 @@ while [ $# -gt 0 ]; do
                -D)
                        shift
                        if echo "x$1" | grep 'x?*=*' > /dev/null; then
-                               ROS_CMAKEOPTS+=" -D $1"
+                               ROS_CMAKEOPTS=$ROS_CMAKEOPTS" -D $1"
                        else
                                usage
                        fi
                ;;
 
                -D?*=*|-D?*)
-                       ROS_CMAKEOPTS+=" $1"
+                       ROS_CMAKEOPTS=$ROS_CMAKEOPTS" $1"
                ;;
                makefiles|Makefiles)
                        CMAKE_GENERATOR="Unix Makefiles"
@@ -41,9 +41,9 @@ while [ $# -gt 0 ]; do
 done
 
 if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
-  echo Creating directories in $REACTOS_OUTPUT_PATH
-  mkdir -p "$REACTOS_OUTPUT_PATH"
-  cd "$REACTOS_OUTPUT_PATH"
+       echo Creating directories in $REACTOS_OUTPUT_PATH
+       mkdir -p "$REACTOS_OUTPUT_PATH"
+       cd "$REACTOS_OUTPUT_PATH"
 fi
 
 mkdir -p host-tools reactos
@@ -53,12 +53,12 @@ cd host-tools
 rm -f CMakeCache.txt
 
 REACTOS_BUILD_TOOLS_DIR="$PWD"
-cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Preparing reactos...
 cd ../reactos
 rm -f CMakeCache.txt
 
-cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DREACTOS_BUILD_TOOLS_DIR:PATH="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Configure script complete! Enter directories and execute appropriate build commands \(ex: ninja, make, makex, etc...\).