Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Updating docs to match build scripts #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Updating docs to match build scripts #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Docs/src/SettingUpOgre/SettingUpOgreLinux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@
# Building Dependencies {#BuildingDependenciesLinux}

```sh
cd Ogre/Dependencies
cd Ogre/ogredeps
mkdir build
cd build
cmake ../
cd build
make
make install```

Expand All @@ -36,19 +35,20 @@ make install```
We'll create both a Release & Debug configuration that match the ones used in Windows.
This eases portability and cross platform development.
```sh
cd Ogre
cd Ogre/ogre-next
ln -s ../ogredeps/build/ogredeps Dependencies
mkdir build
cd build
mkdir Debug
mkdir Release
# Build Debug
cd Debug
cmake -D OGRE_DEPENDENCIES_DIR=Dependencies/build/ogredeps -D OGRE_BUILD_SAMPLES2=1 -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D CMAKE_BUILD_TYPE=Debug ../../
cmake -D OGRE_BUILD_SAMPLES2=1 -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D CMAKE_BUILD_TYPE=Debug ../../
make
make install
# Build Release
cd ../Release
cmake -D OGRE_DEPENDENCIES_DIR=Dependencies/build/ogredeps -D OGRE_BUILD_SAMPLES2=1 -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D CMAKE_BUILD_TYPE=Release ../../
cmake -D OGRE_BUILD_SAMPLES2=1 -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D CMAKE_BUILD_TYPE=Release ../../
make
make install
```
Expand Down
4 changes: 2 additions & 2 deletions Docs/src/SettingUpOgre/SettingUpOgreWindows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,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
hg clone https://bitbucket.org/cabalistic/ogredeps ogredeps
git clone https://github.com/OGRECave/ogre-next
```

**Graphical**
Expand Down