Skip to content
This repository has been archived by the owner on Jun 11, 2020. It is now read-only.

Commit

Permalink
Fixed Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
nurupo committed Jul 14, 2013
1 parent 1bd91a5 commit c5c8abc
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
12 changes: 10 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,24 @@ before_install:
- yes | sudo add-apt-repository ppa:canonical-qt5-edgers/qt5-proper
- sudo apt-get update -qq
- yes | sudo apt-get install qtdeclarative5-dev
- git clone git://github.com/jedisct1/libsodium.git
- cd libsodium
- git checkout tags/0.4.2
- ./autogen.sh
- ./configure && make -j3 check
- sudo make install
- sudo ldconfig
- cd ..

script:
- qmake -qt=qt5 -Wall -Werror projectfiles/QtCreator/TOX-Qt-GUI.pro
- qmake -qt=qt5 -Wall projectfiles/QtCreator/TOX-Qt-GUI.pro
- make -j3

notifications:

irc:
channels:
- "chat.freenode.net#InsertProjectNameHere"
- "chat.freenode.net#Tox-Qt-GUI"
on_success: always
on_failure: always

8 changes: 6 additions & 2 deletions projectfiles/QtCreator/TOX-Qt-GUI.pro
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ TEMPLATE = app

CONFIG += c++11

INCLUDEPATH += ../../src/
INCLUDEPATH += ../../src/ ../../src/core/
win32:INCLUDEPATH += ../../src/sodium/include/

win32:LIBS += -lWS2_32 ../../src/sodium/lib/libsodium.a
win32 {
LIBS += -lWS2_32 ../../src/sodium/lib/libsodium.a
} else {
LIBS += -lsodium
}

SOURCES += \
../../src/main.cpp \
Expand Down
7 changes: 6 additions & 1 deletion src/core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@
#include "core.hpp"

extern "C" {
#include "../../core/Messenger.h"
#include <Messenger.h>
}

#ifndef WIN32
#include <arpa/inet.h>
#endif


#include <QThread>
#include <QDebug>
#include <QMessageBox>
Expand Down

0 comments on commit c5c8abc

Please sign in to comment.