Merge pull request #704 from stqism/patch-5

Adds Jenkins, use ssl when possible
This commit is contained in:
irungentoo 2014-01-27 04:19:50 -08:00
commit 0062119314
2 changed files with 9 additions and 8 deletions

View File

@ -75,7 +75,7 @@ echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
sudo ldconfig sudo ldconfig
``` ```
You also need recent [FFmpeg](http://git.videolan.org/?p=ffmpeg.git) libraries: You also need recent [FFmpeg](https://git.videolan.org/?p=ffmpeg.git) libraries:
```bash ```bash
git clone git://source.ffmpeg.org/ffmpeg.git git clone git://source.ffmpeg.org/ffmpeg.git
cd ffmpeg cd ffmpeg
@ -165,9 +165,9 @@ Advance configure options:
####Non-homebrew: ####Non-homebrew:
Grab the following packages: Grab the following packages:
* http://www.gnu.org/software/libtool/ * https://gnu.org/software/libtool/
* http://www.gnu.org/software/autoconf/ * https://gnu.org/software/autoconf/
* http://www.gnu.org/software/automake/ * https://gnu.org/software/automake/
* https://github.com/jedisct1/libsodium * https://github.com/jedisct1/libsodium
* http://www.hyperrealm.com/libconfig/ * http://www.hyperrealm.com/libconfig/
* http://check.sourceforge.net/ * http://check.sourceforge.net/
@ -218,7 +218,7 @@ You should install:
When installing MinGW, make sure to select the MSYS option in the installer. When installing MinGW, make sure to select the MSYS option in the installer.
MinGW will install an "MinGW shell" (you should get a shortcut for it), make sure to perform all operations (i.e. generating/running configure script, compiling, etc.) from the MinGW shell. MinGW will install an "MinGW shell" (you should get a shortcut for it), make sure to perform all operations (i.e. generating/running configure script, compiling, etc.) from the MinGW shell.
First download the source tarball from http://download.libsodium.org/libsodium/releases/ and build it. First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it.
Assuming that you got the libsodium-0.4.2.tar.gz release: Assuming that you got the libsodium-0.4.2.tar.gz release:
```cmd ```cmd
tar -zxvf libsodium-0.4.2.tar.gz tar -zxvf libsodium-0.4.2.tar.gz

View File

@ -5,9 +5,10 @@ With the rise of governmental monitoring programs, Tox aims to be an easy to use
**IRC**: #tox on freenode, alternatively, you can use the [webchat](http://webchat.freenode.net/?channels=#tox).<br /> **IRC**: #tox on freenode, alternatively, you can use the [webchat](https://webchat.freenode.net/?channels=#tox).<br />
**Website**: [http://tox.im](http://tox.im) **Website**: [https://tox.im](https://tox.im)<br>
**Developer Blog**: [http://dev.tox.im](http://dev.tox.im) **Developer Blog**: [http://dev.tox.im](http://dev.tox.im)<br>
**Jenkins**: [http://jenkins.tox.im](http://jenkins.tox.im)
**Website translations**: [here](https://github.com/Tox/tox.im)<br/> **Website translations**: [here](https://github.com/Tox/tox.im)<br/>
**Qt GUI**: [see nurupo's repository](https://github.com/nurupo/ProjectTox-Qt-GUI) **Qt GUI**: [see nurupo's repository](https://github.com/nurupo/ProjectTox-Qt-GUI)