mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 05:32:55 +00:00
[CMAKE]
configure : Remove reactos cache. Fix echo syntax. svn path=/trunk/; revision=52192
This commit is contained in:
parent
8f6e059fee
commit
e39c778ae1
1 changed files with 7 additions and 2 deletions
|
@ -10,7 +10,6 @@ ARCH=$ROS_ARCH
|
||||||
REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
|
REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
|
||||||
REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
|
REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
|
||||||
|
|
||||||
echo ARCH $ARCH ROS $ROS_ARCH
|
|
||||||
if [ "$REACTOS_SOURCE_DIR" == "$PWD" ]
|
if [ "$REACTOS_SOURCE_DIR" == "$PWD" ]
|
||||||
then
|
then
|
||||||
echo Creating directories in $REACTOS_OUTPUT_PATH
|
echo Creating directories in $REACTOS_OUTPUT_PATH
|
||||||
|
@ -31,8 +30,14 @@ fi
|
||||||
REACTOS_BUILD_TOOLS_DIR="$PWD"
|
REACTOS_BUILD_TOOLS_DIR="$PWD"
|
||||||
cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
|
cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
|
||||||
|
|
||||||
|
echo Preparing reactos...
|
||||||
cd ../reactos
|
cd ../reactos
|
||||||
|
if [ -f CMakeCache.txt ]
|
||||||
|
then
|
||||||
|
rm -f CMakeCache.txt
|
||||||
|
fi
|
||||||
|
|
||||||
cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR"
|
cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$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: make, makex, etc...\).
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue