diff --git a/Docs/src/SettingUpOgre/SettingUpOgreLinux.md b/Docs/src/SettingUpOgre/SettingUpOgreLinux.md index 4e1c22818be..181dcdf696a 100644 --- 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 index 824038db006..179fda2ec75 100644 --- 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 index f9219399dcc..69c953454da 100755 --- 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 index efb4fadedfa..eacd3efa118 100755 --- 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 index 242c117cded..16d709273ec 100644 --- 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 index c7c4a5111be..c2f3e07c1dd 100644 --- 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 index a557fe5fece..98505a26b12 100644 --- 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 index 3450701d6b2..21a29fe7e0d 100644 --- 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 index 931e0e6db0c..e5b0e9eb0c7 100644 --- 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 index 380d821f754..a5252b6d1cd 100644 --- 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 diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_Win32.bat index 163e048efaa..1d012be1a5b 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_Win32.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_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_14_2015_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_x64.bat index 70918c69ce2..ba62a8cc8e5 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_x64.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_14_2015_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_15_2017_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_Win32.bat index f0c2059a658..07acc6cd8b5 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_Win32.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_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_15_2017_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_x64.bat index a9d588c9a7b..f4dc4c11be8 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_x64.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_15_2017_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_16_2019_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_Win32.bat index f3047dd80d0..91934ced3c7 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_Win32.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_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_16_2019_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_x64.bat index 30b5ae6f3ce..3972df64047 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_x64.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_16_2019_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_9_2008_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_9_2008_Win32.bat index 4569226c010..df6c041e255 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_9_2008_Win32.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_9_2008_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_9_2008_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_9_2008_x64.bat index bb118deadfa..7ab885c090c 100644 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_9_2008_x64.bat +++ b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_9_2008_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_linux_c++11.sh b/Scripts/BuildScripts/output/build_ogre_linux_c++11.sh index a52f3af0f00..f6d52834453 100755 --- a/Scripts/BuildScripts/output/build_ogre_linux_c++11.sh +++ b/Scripts/BuildScripts/output/build_ogre_linux_c++11.sh @@ -4,17 +4,17 @@ OGRE_BRANCH_NAME="master" 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 -D CMAKE_CXX_STANDARD=11 -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_linux_c++98.sh b/Scripts/BuildScripts/output/build_ogre_linux_c++98.sh index e537e7b6df8..02cd188e625 100755 --- a/Scripts/BuildScripts/output/build_ogre_linux_c++98.sh +++ b/Scripts/BuildScripts/output/build_ogre_linux_c++98.sh @@ -4,17 +4,17 @@ OGRE_BRANCH_NAME="master" 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 -D CMAKE_CXX_STANDARD=98 -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_linux_c++latest.sh b/Scripts/BuildScripts/output/build_ogre_linux_c++latest.sh index 1f7d613322c..548fb29e6de 100755 --- a/Scripts/BuildScripts/output/build_ogre_linux_c++latest.sh +++ b/Scripts/BuildScripts/output/build_ogre_linux_c++latest.sh @@ -4,17 +4,17 @@ OGRE_BRANCH_NAME="master" 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 -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