From 9a94283309c534e1cff558032b1919a6e9b6b01f Mon Sep 17 00:00:00 2001
From: Anselme <anselme.francois@gmail.com>
Date: Mon, 25 Sep 2017 16:02:11 +0200
Subject: [PATCH] SparrowBot is now linking with mmokoban

---
 .gitignore        |  6 ++++--
 .qmake.conf       |  4 +++-
 app/app.pro       | 27 +++++++++++++++++++++++++--
 autolaunch.sh     | 15 +++++++++++----
 ircbot/ircbot.pro |  2 +-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index bc08231..455ecb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
 build/*
 debug/*
 release/*
-*.user
 *.Debug
 *.Release
 Makefile
 ui_*
 bin/*
-build*
\ No newline at end of file
+build*
+*.user
+lib
+deploy
\ No newline at end of file
diff --git a/.qmake.conf b/.qmake.conf
index d96a3bf..4b61356 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,4 @@
 bin_dir=$$PWD/bin
-lib_dir=$$PWD/lib
\ No newline at end of file
+lib_dir=$$PWD/lib
+mmokoban_lib_dir=$$PWD/../mmokoban/lib
+include_dir=$$PWD/../mmokoban/src
diff --git a/app/app.pro b/app/app.pro
index bf6ccd3..053d6e7 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,13 +1,36 @@
 QT       += core gui network widgets
 
-DESTDIR = $$relative_path($$bin_dir)
+DESTDIR = $$bin_dir
+
 
 TARGET = SparrowBot
 TEMPLATE = app
 CONFIG += c++11
 
-LIBS += $$relative_path($$lib_dir/libircbot.a)
+QMAKE_CXXFLAGS += -std=c++11
+QMAKE_CXXFLAGS += -fno-strict-aliasing
+
+DEFINES += SFML_STATIC
+
+LIBPATH += $$lib_dir
+LIBPATH += $$mmokoban_lib_dir
+win32 {
+    LIBPATH += $$mmokoban_lib_dir/MinGW_32
+}
+unix {
+    LIBPATH += $$mmokoban_lib_dir/linux_64
+}
+
+LIBS += -lserverlib -lcommon -lircbot
+win32 {
+    LIBS += -lsfml-network-s -lws2_32 -lsfml-system-s -lwinmm
+}
+unix {
+    LIBS += -lsfml-network-s -lsfml-system-s -ldl -lpthread -ludev
+}
+
 INCLUDEPATH += ../ircbot
+INCLUDEPATH += $$include_dir
 
 SOURCES = main.cpp \
     regismodule.cpp \
diff --git a/autolaunch.sh b/autolaunch.sh
index 5a76aaa..d831259 100755
--- a/autolaunch.sh
+++ b/autolaunch.sh
@@ -1,12 +1,19 @@
 #!/bin/sh
-mkdir build
+mkdir SparrowBot/build
+mkdir mmokoban/build
 while true
 do
-	git pull https://git.epicsparrow.com/Anselme/SparrowBot.git
+	cd mmokoban
+	git pull
+	cd build
+	qmake-qt5 ../mmokoban.pro
+	make -j4
+	cd ../../SparrowBot
+	git pull
 	cd build
 	qmake-qt5 ../SparrowBot.pro
-	make
-	cd bin
+	make -j4
+	cd ../deploy
 	./SparrowBot -nogui nick=SirSparrow pass=$1 chan=epicsparrow server=irc.freenode.net port=6667
 	cd ../..
 done
diff --git a/ircbot/ircbot.pro b/ircbot/ircbot.pro
index 382035e..e6565be 100644
--- a/ircbot/ircbot.pro
+++ b/ircbot/ircbot.pro
@@ -1,6 +1,6 @@
 QT       += core gui network widgets
 
-DESTDIR = $$relative_path($$lib_dir)
+DESTDIR = $$lib_dir
 
 TARGET = ircbot