[MCISEQ] Sync with Wine Staging 4.18. CORE-16441

[reactos.git] / configure.sh

diff --git a/configure.sh b/configure.sh
index be49ba4..9ff7280 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -46,19 +46,9 @@ if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
        cd "$REACTOS_OUTPUT_PATH"
 fi
 
-mkdir -p host-tools reactos
-
-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 "$REACTOS_SOURCE_DIR"
-
 echo Preparing reactos...
-cd ../reactos
-rm -f CMakeCache.txt
+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 $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Configure script complete! Enter directories and execute appropriate build commands \(ex: ninja, make, makex, etc...\).