X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=configure.sh;h=64a18db4c8fae6fe896301ed3019a689e406aa8a;hp=be49ba464e3cc2f51e789b285822b672e73e4961;hb=c8d37c1a0d1297b2daada64e1805f6705b52cb22;hpb=db5b0c31c400543001fe648a996bbcc5e56b7f63

diff --git a/configure.sh b/configure.sh
index be49ba464e3..64a18db4c8f 100755
--- a/configure.sh
+++ b/configure.sh
@@ -9,6 +9,7 @@ BUILD_ENVIRONMENT=MinGW
 ARCH=$ROS_ARCH
 REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
 REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
+USE_NEW_STYLE=1
 
 usage() {
 	echo Invalid parameter given.
@@ -33,6 +34,9 @@ while [ $# -gt 0 ]; do
 		makefiles|Makefiles)
 			CMAKE_GENERATOR="Unix Makefiles"
 		;;
+		with-host-tools)
+			USE_NEW_STYLE=0
+		;;
 		*)
 			usage
 	esac
@@ -46,19 +50,27 @@ if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
 	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:STRING=$ARCH $ROS_CMAKEOPTS "$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: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"
+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: ninja, make, makex, etc...\).