summaryrefslogtreecommitdiffstats
path: root/compile.sh
diff options
context:
space:
mode:
authorSafwat Halaby <SafwatHalaby@users.noreply.github.com>2015-09-26 20:44:12 +0200
committerSafwat Halaby <SafwatHalaby@users.noreply.github.com>2015-09-26 20:44:12 +0200
commit78faad480b76afedebea156a642c4f792c5ea273 (patch)
tree134a1259e2dee011d901a995fe9bcbc322638055 /compile.sh
parentMerge pull request #2463 from cuberite/fixes (diff)
parentFix compile.sh console commit version, see #2493 (diff)
downloadcuberite-78faad480b76afedebea156a642c4f792c5ea273.tar
cuberite-78faad480b76afedebea156a642c4f792c5ea273.tar.gz
cuberite-78faad480b76afedebea156a642c4f792c5ea273.tar.bz2
cuberite-78faad480b76afedebea156a642c4f792c5ea273.tar.lz
cuberite-78faad480b76afedebea156a642c4f792c5ea273.tar.xz
cuberite-78faad480b76afedebea156a642c4f792c5ea273.tar.zst
cuberite-78faad480b76afedebea156a642c4f792c5ea273.zip
Diffstat (limited to 'compile.sh')
-rwxr-xr-xcompile.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/compile.sh b/compile.sh
index fae149667..19d49b6b2 100755
--- a/compile.sh
+++ b/compile.sh
@@ -164,10 +164,9 @@ git submodule update --init
# Cmake.
echo " --- Running cmake..."
-popd
if [ ! -d build-cuberite ]; then mkdir build-cuberite; fi
pushd build-cuberite
-cmake ../cuberite/ -DCMAKE_BUILD_TYPE=$BUILDTYPE || error "cmake failed"
+cmake .. -DCMAKE_BUILD_TYPE=$BUILDTYPE || error "cmake failed"
# Make.
@@ -178,7 +177,7 @@ echo
# Echo: Compilation complete.
popd > /dev/null
-pushd cuberite/Server > /dev/null
+pushd Server > /dev/null
echo
echo "-----------------"
echo "Compilation done!"
@@ -192,6 +191,7 @@ fi
echo
echo "Enjoy :)"
popd > /dev/null
+popd > /dev/null
exit 0
:windows_detected