Merge branch 'master' into tic_0.46.0

This commit is contained in:
BADIM-PC\Vadim 2017-09-29 09:51:43 +03:00
commit 69a88bcf5c
1 changed files with 16 additions and 6 deletions

View File

@ -1,5 +1,4 @@
TIC-80 issues tracker and wiki # TIC-80 issues tracker and wiki
=======
[Discord chat](https://discord.gg/DkD73dP) [Discord chat](https://discord.gg/DkD73dP)
@ -9,8 +8,10 @@ Documentation is available in the [wiki](https://github.com/nesbox/tic.computer/
Thanks! Thanks!
Building with Visual Studio 2015 # Building instructions
=======
## Windows
### with Visual Studio 2015
- install Visual Studio 2015 - install Visual Studio 2015
- install GIT - install GIT
- run following commands in `cmd` - run following commands in `cmd`
@ -18,7 +19,16 @@ Building with Visual Studio 2015
mkdir tic mkdir tic
cd tic cd tic
git clone https://github.com/nesbox/3rd-party git clone https://github.com/nesbox/3rd-party
git clone https://github.com/nesbox/TIC-80.git git clone https://github.com/nesbox/TIC-80
``` ```
- open `TIC-80\build\windows\tic\tic.sln` and run build - open `TIC-80\build\windows\tic\tic.sln` and build
- enjoy :) - enjoy :)
## Linux
run the following commands in the Terminal
```
sudo apt-get install git build-essential libgtk-3-dev
git clone https://github.com/nesbox/TIC-80
cd TIC-80
make linux32 (or linux64/arm depending on your system)
```