Merge

OGRECave · Apr 27, 2020 · 6a814a0 · 6a814a0
2 parents f2facb9 + d300216
commit 6a814a0
Show file tree

Hide file tree

Showing 21 changed files with 172 additions and 186 deletions.
diff --git a/Docs/src/SettingUpOgre/SettingUpOgreLinux.md b/Docs/src/SettingUpOgre/SettingUpOgreLinux.md
@@ -4,7 +4,7 @@
 
 # Requirements {#RequirementsLinux}
     * [CMake 3.x](https://cmake.org/download/)
-    * Mercurial. We recommend [TortoiseHg](https://tortoisehg.bitbucket.io/download/index.html)
+    * Git
     * What you do **NOT** need: Boost. Don't waste your time.
     * Clang >3.5 or GCC >4.0
     * [QtCreator](https://download.qt.io/official_releases/qtcreator/) recommended (Optional).

diff --git a/Docs/src/SettingUpOgre/SettingUpOgreWindows.md b/Docs/src/SettingUpOgre/SettingUpOgreWindows.md
@@ -4,7 +4,7 @@
 
 # Requirements {#RequirementsWindows}
     * [CMake 3.x](https://cmake.org/download/)
-    * Mercurial. We recommend [TortoiseHg](https://tortoisehg.bitbucket.io/download/index.html)
+    * Git
     * What you do **NOT** need: Boost. Don't waste your time.
     * Visual Studio 2008 SP1 - 2017 (2019 not tested). MinGW may work but we strongly recommend Visual Studio.
     * [DirectX June 2010 SDK](https://www.microsoft.com/en-us/download/details.aspx?id=6812). Optional.
@@ -82,7 +82,7 @@ Don't worry, those CMake configs are about the *old threading* model. For more i
 We easy-to-use scripts that will download and setup all dependencies for you in a self-contained folder
 Download build_ogre_scripts for the branch you need from:
 
-https://bitbucket.org/sinbad/ogre/downloads/
+https://www.ogre3d.org/download/sdk/sdk-ogre-next
 
 @}
 
@@ -95,23 +95,9 @@ Most dependencies are conveniently stored in its own repository called "ogredeps
 
 **Command line**:
 ```sh
-mkdir Ogre
-hg clone https://bitbucket.org/sinbad/ogre -r v2-1
-cd Ogre
-hg clone https://bitbucket.org/cabalistic/ogredeps Dependencies
+git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
+git clone --branch v2-1 https://github.com/OGRECave/ogre-next
 ```
-
-**Graphical**
-
-Clone *Ogre*:
-![](images/CloneOgre.png)
-
-Now clone the *ogredeps* repository:
-![](images/CloneOgreDeps.png)
-
-Make sure Ogre is in the 2.1 branch:
-![](images/BranchCheckout.png)
-*Note:* If the branch filter doesn't appear, hit Ctrl+S
 @}
 
 @}
diff --git a/Scripts/BuildScripts/build_ogre.bat b/Scripts/BuildScripts/build_ogre.bat
@@ -25,17 +25,17 @@ echo Using CMake at %CMAKE_BIN%
 
 mkdir Ogre
 cd Ogre
-IF NOT EXIST ogredeps (
-	mkdir ogredeps
-	echo --- Cloning Ogredeps ---
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+IF NOT EXIST ogre-next-deps (
+	mkdir ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo --- Building Ogredeps ---
+echo --- Building ogre-next-deps ---
 %CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% ..
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug
@@ -49,12 +49,12 @@ IF NOT EXIST ogre-next (
 )
 cd ogre-next
 IF NOT EXIST Dependencies (
-	mklink /D Dependencies ..\ogredeps\build\ogredeps
+	mklink /D Dependencies ..\ogre-next-deps\build\ogredeps
 )
 mkdir build
 cd build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
+%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
 echo --- Building Ogre (Debug) ---
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug

diff --git a/Scripts/BuildScripts/build_ogre_linux.sh b/Scripts/BuildScripts/build_ogre_linux.sh
@@ -4,17 +4,17 @@ OGRE_BRANCH_NAME="{0}"
 
 mkdir Ogre
 cd Ogre
-if test ! -f ogredeps; then
-	mkdir ogredeps
-	echo "--- Cloning Ogredeps ---"
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+if test ! -f ogre-next-deps; then
+	mkdir ogre-next-deps
+	echo "--- Cloning ogre-next-deps ---"
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 else
-	echo "--- Ogredeps repo detected. Cloning skipped ---"
+	echo "--- ogre-next-deps repo detected. Cloning skipped ---"
 fi
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo "--- Building Ogredeps ---"
+echo "--- Building ogre-next-deps ---"
 cmake {1} -G Ninja ..
 ninja
 ninja install
@@ -27,7 +27,7 @@ if test ! -f ogre-next; then
 fi
 cd ogre-next
 if test ! -f Dependencies; then
-	ln -s ../ogredeps/build/ogredeps Dependencies
+	ln -s ../ogre-next-deps/build/ogredeps Dependencies
 fi
 mkdir -p build/Debug
 mkdir -p build/Release

diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_10_2010_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_10_2010_Win32.bat
@@ -25,17 +25,17 @@ echo Using CMake at %CMAKE_BIN%
 
 mkdir Ogre
 cd Ogre
-IF NOT EXIST ogredeps (
-	mkdir ogredeps
-	echo --- Cloning Ogredeps ---
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+IF NOT EXIST ogre-next-deps (
+	mkdir ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo --- Building Ogredeps ---
+echo --- Building ogre-next-deps ---
 %CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% ..
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug
@@ -49,12 +49,12 @@ IF NOT EXIST ogre-next (
 )
 cd ogre-next
 IF NOT EXIST Dependencies (
-	mklink /D Dependencies ..\ogredeps\build\ogredeps
+	mklink /D Dependencies ..\ogre-next-deps\build\ogredeps
 )
 mkdir build
 cd build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
+%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
 echo --- Building Ogre (Debug) ---
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug

diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_10_2010_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_10_2010_x64.bat
@@ -25,17 +25,17 @@ echo Using CMake at %CMAKE_BIN%
 
 mkdir Ogre
 cd Ogre
-IF NOT EXIST ogredeps (
-	mkdir ogredeps
-	echo --- Cloning Ogredeps ---
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+IF NOT EXIST ogre-next-deps (
+	mkdir ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo --- Building Ogredeps ---
+echo --- Building ogre-next-deps ---
 %CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% ..
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug
@@ -49,12 +49,12 @@ IF NOT EXIST ogre-next (
 )
 cd ogre-next
 IF NOT EXIST Dependencies (
-	mklink /D Dependencies ..\ogredeps\build\ogredeps
+	mklink /D Dependencies ..\ogre-next-deps\build\ogredeps
 )
 mkdir build
 cd build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
+%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
 echo --- Building Ogre (Debug) ---
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug

diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_11_2012_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_11_2012_Win32.bat
@@ -25,17 +25,17 @@ echo Using CMake at %CMAKE_BIN%
 
 mkdir Ogre
 cd Ogre
-IF NOT EXIST ogredeps (
-	mkdir ogredeps
-	echo --- Cloning Ogredeps ---
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+IF NOT EXIST ogre-next-deps (
+	mkdir ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo --- Building Ogredeps ---
+echo --- Building ogre-next-deps ---
 %CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% ..
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug
@@ -49,12 +49,12 @@ IF NOT EXIST ogre-next (
 )
 cd ogre-next
 IF NOT EXIST Dependencies (
-	mklink /D Dependencies ..\ogredeps\build\ogredeps
+	mklink /D Dependencies ..\ogre-next-deps\build\ogredeps
 )
 mkdir build
 cd build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
+%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
 echo --- Building Ogre (Debug) ---
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug

diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_11_2012_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_11_2012_x64.bat
@@ -25,17 +25,17 @@ echo Using CMake at %CMAKE_BIN%
 
 mkdir Ogre
 cd Ogre
-IF NOT EXIST ogredeps (
-	mkdir ogredeps
-	echo --- Cloning Ogredeps ---
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+IF NOT EXIST ogre-next-deps (
+	mkdir ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo --- Building Ogredeps ---
+echo --- Building ogre-next-deps ---
 %CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% ..
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug
@@ -49,12 +49,12 @@ IF NOT EXIST ogre-next (
 )
 cd ogre-next
 IF NOT EXIST Dependencies (
-	mklink /D Dependencies ..\ogredeps\build\ogredeps
+	mklink /D Dependencies ..\ogre-next-deps\build\ogredeps
 )
 mkdir build
 cd build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
+%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
 echo --- Building Ogre (Debug) ---
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug

diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_Win32.bat
@@ -25,17 +25,17 @@ echo Using CMake at %CMAKE_BIN%
 
 mkdir Ogre
 cd Ogre
-IF NOT EXIST ogredeps (
-	mkdir ogredeps
-	echo --- Cloning Ogredeps ---
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+IF NOT EXIST ogre-next-deps (
+	mkdir ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo --- Building Ogredeps ---
+echo --- Building ogre-next-deps ---
 %CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% ..
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug
@@ -49,12 +49,12 @@ IF NOT EXIST ogre-next (
 )
 cd ogre-next
 IF NOT EXIST Dependencies (
-	mklink /D Dependencies ..\ogredeps\build\ogredeps
+	mklink /D Dependencies ..\ogre-next-deps\build\ogredeps
 )
 mkdir build
 cd build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
+%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
 echo --- Building Ogre (Debug) ---
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug

diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_x64.bat
@@ -25,17 +25,17 @@ echo Using CMake at %CMAKE_BIN%
 
 mkdir Ogre
 cd Ogre
-IF NOT EXIST ogredeps (
-	mkdir ogredeps
-	echo --- Cloning Ogredeps ---
-	hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
+IF NOT EXIST ogre-next-deps (
+	mkdir ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-cd ogredeps
+cd ogre-next-deps
 mkdir build
 cd build
-echo --- Building Ogredeps ---
+echo --- Building ogre-next-deps ---
 %CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% ..
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug
@@ -49,12 +49,12 @@ IF NOT EXIST ogre-next (
 )
 cd ogre-next
 IF NOT EXIST Dependencies (
-	mklink /D Dependencies ..\ogredeps\build\ogredeps
+	mklink /D Dependencies ..\ogre-next-deps\build\ogredeps
 )
 mkdir build
 cd build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
+%CMAKE_BIN% -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% ..
 echo --- Building Ogre (Debug) ---
 %CMAKE_BIN% --build . --config Debug
 %CMAKE_BIN% --build . --target install --config Debug