Skip to content

Commit 9c976b2

Browse files
committed
Update rstox to c-toxcore v0.2
1 parent b88b72d commit 9c976b2

File tree

7 files changed

+1289
-905
lines changed

7 files changed

+1289
-905
lines changed

.travis.yml

+17-21
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,20 @@ matrix:
1010
sudo: required
1111

1212
before_install:
13-
- sudo apt-get update -qq
14-
- sudo apt-get install -y build-essential libtool autotools-dev automake checkinstall check git yasm pkg-config libvpx-dev
15-
- wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
16-
- tar xvzf opus-1.0.3.tar.gz
17-
- cd opus-1.0.3
18-
- ./configure
19-
- make -j$(nproc)
20-
- sudo make install
21-
- cd ..
22-
- git clone git://github.com/jedisct1/libsodium.git
23-
- cd libsodium
24-
- git checkout tags/1.0.3
25-
- ./autogen.sh
26-
- ./configure && make -j$(nproc)
27-
- sudo checkinstall --install --pkgname libsodium --pkgversion 1.0.3 --nodoc -y
28-
- sudo ldconfig
29-
- cd ..
30-
- git clone https://github.com/irungentoo/toxcore.git
31-
- cd toxcore && autoreconf -if && ./configure && make -j$(nproc) && sudo make install
32-
- echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
33-
- sudo ldconfig
13+
- |
14+
sudo apt-get update -qq
15+
sudo apt-get install -y build-essential libtool autotools-dev automake checkinstall \
16+
cmake check git yasm pkg-config libvpx-dev libopus-dev
17+
- |
18+
git clone -b 1.0.17 git://github.com/jedisct1/libsodium.git
19+
cd libsodium
20+
./autogen.sh
21+
./configure && make -j$(nproc)
22+
sudo checkinstall --install --pkgname libsodium --pkgversion 1.0.17 --nodoc -y
23+
- |
24+
git clone -b v0.2.9 https://github.com/TokTok/c-toxcore.git
25+
cd c-toxcore
26+
mkdir _build && cd _build
27+
cmake ..
28+
make
29+
sudo make install

examples/encryptfile.rs

-39
This file was deleted.

examples/test.rs

-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ fn main() {
2222
FriendRequest(cid, _) => {
2323
tox.add_friend_norequest(&cid).unwrap();
2424
},
25-
GroupInvite(fid, kind, data) => {
26-
match kind {
27-
GroupchatType::Text => { tox.join_groupchat(fid, &data).unwrap(); },
28-
_ => {},
29-
}
30-
},
3125
ev => { println!("Tox event: {:?}", ev); },
3226
}
3327
}

examples/testav.rs

-85
This file was deleted.

0 commit comments

Comments
 (0)