X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=configure.sh;h=64a18db4c8fae6fe896301ed3019a689e406aa8a;hp=f5d289c0eb2296b68316e357f594b5db36b47bab;hb=10582455b36fd93d70302fc4388659ef31f33ef7;hpb=c70f992aa17e22fdd474580a1e10c253c258b88f

diff --git a/configure.sh b/configure.sh
index f5d289c0eb2..64a18db4c8f 100755
--- a/configure.sh
+++ b/configure.sh
@@ -1,39 +1,76 @@
 #!/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
 ARCH=$ROS_ARCH
 REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
 REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
-if [ "$1" = "ninja" ]; then
+USE_NEW_STYLE=1
+
+usage() {
+	echo Invalid parameter given.
+	exit 1
+}
+
 CMAKE_GENERATOR="Ninja"
-else
-CMAKE_GENERATOR="Unix Makefiles"
-fi
+while [ $# -gt 0 ]; do
+	case $1 in
+		-D)
+			shift
+			if echo "x$1" | grep 'x?*=*' > /dev/null; then
+				ROS_CMAKEOPTS=$ROS_CMAKEOPTS" -D $1"
+			else
+				usage
+			fi
+		;;
+
+		-D?*=*|-D?*)
+			ROS_CMAKEOPTS=$ROS_CMAKEOPTS" $1"
+		;;
+		makefiles|Makefiles)
+			CMAKE_GENERATOR="Unix Makefiles"
+		;;
+		with-host-tools)
+			USE_NEW_STYLE=0
+		;;
+		*)
+			usage
+	esac
+
+	shift
+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
+mkdir -p reactos
+
+#EXTRA_ARGS=""
+if [ $USE_NEW_STYLE -eq 0 ]; then
+	mkdir -p host-tools
+	echo Preparing host tools...
+	cd host-tools
+	rm -f CMakeCache.txt
 
-echo Preparing host tools...
-cd host-tools
-rm -f CMakeCache.txt
+	REACTOS_BUILD_TOOLS_DIR="$PWD"
+	cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR"
 
-REACTOS_BUILD_TOOLS_DIR="$PWD"
-cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
+	EXTRA_ARGS="$EXTRA_ARGS -DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR"
+
+	cd ..
+fi
 
 echo Preparing reactos...
-cd ../reactos
-rm -f CMakeCache.txt
+cd reactos
+rm -f CMakeCache.txt host-tools/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" "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
-echo Configure script complete! Enter directories and execute appropriate build commands\(ex: make, makex, etc...\).
+echo Configure script complete! Enter directories and execute appropriate build commands \(ex: ninja, make, makex, etc...\).