[BROWSEUI] Try to "fix" IEThreadParamBlock structure for x64

[reactos.git] / configure.sh

diff --git a/configure.sh b/configure.sh
index e439723..52417c0 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -50,11 +50,10 @@ if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
        cd "$REACTOS_OUTPUT_PATH"
 fi
 
-mkdir -p reactos
-
-EXTRA_ARGS=""
+#EXTRA_ARGS=""
 if [ $USE_NEW_STYLE -eq 0 ]; then
        mkdir -p host-tools
+       mkdir -p reactos
        echo Preparing host tools...
        cd host-tools
        rm -f CMakeCache.txt
@@ -62,14 +61,18 @@ if [ $USE_NEW_STYLE -eq 0 ]; then
        REACTOS_BUILD_TOOLS_DIR="$PWD"
        cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR"
 
-       EXTRA_ARGS="-DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_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
+
+if [ $USE_NEW_STYLE -eq 0 ]; then
+       cd reactos
+fi
+
+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 -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"