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

Jump to bottom

Fix the build instructions #1616

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Fix the build instructions #1616

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54b392d
Fix the build instructions
hexagonrecursion Nov 12, 2023
daf5e63
Expand the build instructions
hexagonrecursion Nov 13, 2023
df4167c
Change the instructions to recommend dev
hexagonrecursion Nov 20, 2023
fe8b72a
Shader dirrectory was moved
hexagonrecursion Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions docs/README-dev.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,15 @@ Because of the above, include paths in source should always feature the full pat
Note that the recommended way of building the project is to use separate build directory, where CMake will generate all targets. In this way, you can keep a clean source directory. The following shell commands illustrate this usage:

```sh
cd <colobot_repository>
git clone https://github.com/colobot/colobot.git
cd colobot
git submodule update --init
ln --symbolic ../colobot-base/src/graphics/opengl33/shaders/ data/ # ON BRANCH master RUN THIS INSTEAD: ln --symbolic ../src/graphics/opengl/shaders/ data/
mkdir build
cmake ../
cd build
cmake -D TRANSLATIONS=OFF ../ # You can't compile translations unless you have python2
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TRANSLATIONS=OFF should be removed once colobot/colobot-data#88 is merged AND both dev and master use the new data.

Update: colobot/colobot-data#88 has been merged, but git submodule has not been updated.

make
bin/colobot -datadir ../data
./colobot -datadir ../data
```

## Tests organization
Expand Down