Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 20:33:02 +01:00
Code Issues Projects Releases Wiki Activity

add a .travis file and some build fixes

Browse Source
This commit is contained in:
jfreegman 2018-02-26 02:34:38 -05:00
parent 2710ab6034
commit 221edb0012
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
6 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.travis.yml Normal file
View File

@ -0,0 +1,31 @@
language: python
python: nightly
addons:
apt:
packages:
- libalut-dev
- libconfig-dev
- libnotify-dev
- libopenal-dev
- libopus-dev
- libqrencode-dev
- libvpx-dev
cache:
directories:
- $HOME/cache
install:
# Where to find libraries.
- export LD_LIBRARY_PATH=$HOME/cache/usr/lib
- export PKG_CONFIG_PATH=$HOME/cache/usr/lib/pkgconfig
# c-sodium
- git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium
- test -f $HOME/cache/usr/lib/libsodium.so || (cd libsodium && ./configure --prefix=$HOME/cache/usr && make install -j$(nproc))
# c-toxcore
- git clone --depth=1 https://github.com/TokTok/c-toxcore
- test -f $HOME/cache/usr/lib/libtoxcore.so || (cd c-toxcore && cmake -B_build -H. -DCMAKE_INSTALL_PREFIX:PATH=$HOME/cache/usr && make -C_build install -j$(nproc))
script:
- make ENABLE_PYTHON=1

2
Makefile
View File

@ -3,7 +3,7 @@ CFG_DIR = $(BASE_DIR)/cfg
-include $(CFG_DIR)/global_vars.mk -include $(CFG_DIR)/global_vars.mk
LIBS = libtoxcore ncursesw libconfig libqrencode LIBS = toxcore ncursesw libconfig libqrencode
CFLAGS = -std=gnu99 -pthread -Wall -g -fstack-protector-all CFLAGS = -std=gnu99 -pthread -Wall -g -fstack-protector-all
CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64 CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64

2
cfg/checks/audio.mk
View File

@ -1,5 +1,5 @@
# Variables for audio call support # Variables for audio call support
AUDIO_LIBS = libtoxav openal AUDIO_LIBS = openal
AUDIO_CFLAGS = -DAUDIO AUDIO_CFLAGS = -DAUDIO
ifneq (, $(findstring audio_device.o, $(OBJ))) ifneq (, $(findstring audio_device.o, $(OBJ)))
AUDIO_OBJ = audio_call.o AUDIO_OBJ = audio_call.o

2
cfg/checks/video.mk
View File

@ -1,5 +1,5 @@
# Variables for video call support # Variables for video call support
VIDEO_LIBS = libtoxav vpx x11 VIDEO_LIBS = vpx x11
VIDEO_CFLAGS = -DVIDEO VIDEO_CFLAGS = -DVIDEO
ifneq (, $(findstring video_device.o, $(OBJ))) ifneq (, $(findstring video_device.o, $(OBJ)))
VIDEO_OBJ = video_call.o VIDEO_OBJ = video_call.o

2
src/api.c
View File

@ -36,7 +36,6 @@
#ifdef PYTHON #ifdef PYTHON
#include "python_api.h" #include "python_api.h"
#endif /* PYTHON */
Tox *user_tox; Tox *user_tox;
static WINDOW *cur_window; static WINDOW *cur_window;
@ -208,3 +207,4 @@ void invoke_autoruns(WINDOW *window, ToxWindow *self)
closedir(d); closedir(d);
} }
#endif /* PYTHON */

2
src/python_api.c
View File

@ -23,7 +23,6 @@
#ifdef PYTHON #ifdef PYTHON
#include <Python.h> #include <Python.h>
#include "api.h" #include "api.h"
#endif /* PYTHON */
#include "execute.h" #include "execute.h"
@ -345,3 +344,4 @@ void python_draw_handler_help(WINDOW *win)
wprintw(win, " %-29s: %.50s\n", cur->name, cur->help); wprintw(win, " %-29s: %.50s\n", cur->name, cur->help);
} }
} }
#endif /* PYTHON */