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

Merge branch 'louipc-new'

Browse Source
This commit is contained in:
Jfreegman 2014-10-13 00:16:05 -04:00
commit d2008aa92f
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -5,7 +5,7 @@ compiler:
before_script: before_script:
# Installing yasm (needed for compiling vpx) and openal # Installing yasm (needed for compiling vpx) and openal
- sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev asciidoc - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev
# Installing libsodium, needed for toxcore # Installing libsodium, needed for toxcore
- git clone https://github.com/jedisct1/libsodium.git libsodium - git clone https://github.com/jedisct1/libsodium.git libsodium
- cd libsodium - cd libsodium

2
README.md
View File

@ -24,7 +24,7 @@ Toxic is a [Tox](https://tox.im)-based instant messenging client which formerly
##### Documentation ##### Documentation
* [Asciidoc](http://asciidoc.org/index.html) (only required for regenerating manpages) * [Asciidoc](http://asciidoc.org/index.html) (only required for regenerating manpages)
* Run `make doc` after editing the asciidoc files to regenerate the manpages. * Run `make doc` in the build directory after editing the asciidoc files to regenerate the manpages.
* **NOTE FOR DEVELOPERS**: asciidoc files and generated manpages will need to be commited together. * **NOTE FOR DEVELOPERS**: asciidoc files and generated manpages will need to be commited together.
### Compiling ### Compiling

2
build/Makefile
View File

@ -46,7 +46,7 @@ endif
-include $(CFG_DIR)/checks/check_features.mk -include $(CFG_DIR)/checks/check_features.mk
# Targets # Targets
all: toxic doc all: toxic
toxic: $(OBJ) toxic: $(OBJ)
@echo " LD $@" @echo " LD $@"

2
cfg/targets/install.mk
View File

@ -1,5 +1,5 @@
# Install target # Install target
install: toxic doc install: toxic
mkdir -p $(abspath $(DESTDIR)/$(BINDIR)) mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
mkdir -p $(abspath $(DESTDIR)/$(DATADIR)) mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds

2
src/prompt.c
View File

@ -427,7 +427,7 @@ static void print_welcome_msg(ToxWindow *self)
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_ _/ _ \\ \\/ /_ _/ ___|"); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_ _/ _ \\ \\/ /_ _/ ___|");
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || | | \\ / | | | "); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || | | \\ / | | | ");
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || |_| / \\ | | |___ "); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || |_| / \\ | | |___ ");
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_| \\___/_/\\_\\___\\____|"); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_| \\___/_/\\_\\___\\____| v." TOXICVER);
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, ""); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "");
const char *msg = "Welcome to Toxic, a free, open source Tox-based instant messenging client."; const char *msg = "Welcome to Toxic, a free, open source Tox-based instant messenging client.";