From c5c8abc416fbf1bbfa5b2c35bb8e9a9f2eaf60e1 Mon Sep 17 00:00:00 2001
From: Maxim Biro <nurupo.contributions@gmail.com>
Date: Sun, 14 Jul 2013 19:16:07 -0400
Subject: [PATCH] Fixed Travis

---
 .travis.yml                           | 12 ++++++++++--
 projectfiles/QtCreator/TOX-Qt-GUI.pro |  8 ++++++--
 src/core.cpp                          |  7 ++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1e7a0e..3e548b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
     
\ No newline at end of file
diff --git a/projectfiles/QtCreator/TOX-Qt-GUI.pro b/projectfiles/QtCreator/TOX-Qt-GUI.pro
index 239a983..b90ffdf 100644
--- a/projectfiles/QtCreator/TOX-Qt-GUI.pro
+++ b/projectfiles/QtCreator/TOX-Qt-GUI.pro
@@ -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 \
diff --git a/src/core.cpp b/src/core.cpp
index ecc37dc..96e92ef 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -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>