1
0

Merge pull request #2496 from SafwatHalaby/compileCommitId

Fixed compile.sh console commit version, see #2493
This commit is contained in:
Safwat Halaby 2015-09-26 21:44:12 +03:00
commit 78faad480b

View File

@ -164,10 +164,9 @@ git submodule update --init
# Cmake. # Cmake.
echo " --- Running cmake..." echo " --- Running cmake..."
popd
if [ ! -d build-cuberite ]; then mkdir build-cuberite; fi if [ ! -d build-cuberite ]; then mkdir build-cuberite; fi
pushd build-cuberite pushd build-cuberite
cmake ../cuberite/ -DCMAKE_BUILD_TYPE=$BUILDTYPE || error "cmake failed" cmake .. -DCMAKE_BUILD_TYPE=$BUILDTYPE || error "cmake failed"
# Make. # Make.
@ -178,7 +177,7 @@ echo
# Echo: Compilation complete. # Echo: Compilation complete.
popd > /dev/null popd > /dev/null
pushd cuberite/Server > /dev/null pushd Server > /dev/null
echo echo
echo "-----------------" echo "-----------------"
echo "Compilation done!" echo "Compilation done!"
@ -192,6 +191,7 @@ fi
echo echo
echo "Enjoy :)" echo "Enjoy :)"
popd > /dev/null popd > /dev/null
popd > /dev/null
exit 0 exit 0
:windows_detected :windows_detected